Changeset 4b459a7 in observatorio

Timestamp:

May 29, 2015, 11:44:11 AM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Parents:

c9ef273

Message:

Modulo de calculo de divisas por producto y envoltorio python

Location:

simulacion/ModuloDinamico

Files:

• Makefile (modified) (4 diffs)
• compute_exchange.C (added)
• compute_exchange.H (added)
• compute_exchange.i (added)
• queries.C (modified) (1 diff)
• queries.H (modified) (1 diff)

simulacion/ModuloDinamico/Makefile

@@ -24 +24 @@
 FLAGS += -DDEBUG -D_GLIBCXX__PTHREADS $(WARN) $(XML)
 
-
 INCLUDE = -I $(ALEPH) -I . -I $(DB) -I $(PQ)
 
@@ -38 +37 @@
 SGB = sigesic_graph_builder
 
+CEV = compute_exchange
+
 SGB_WRAP = $(SGB)_wrap
 SIM_WRAP = $(SIM)_wrap
+CEV_WRAP = $(CEV)_wrap
 
 SOURCES = good.C product.C input.C imported_product.C ip_relationship.C \
-          io_manager.C queries.C utils.C exogenous_variables.C simulator.C
+          io_manager.C queries.C utils.C exogenous_variables.C simulator.C \
+          compute_exchange.C
 
 OBJECTS = good.o product.o input.o imported_product.o ip_relationship.o \
-          io_manager.o queries.o utils.o exogenous_variables.o simulator.o
+          io_manager.o queries.o utils.o exogenous_variables.o simulator.o \
+          compute_exchange.o
 
 test: obj
@@ -54 +58 @@
         $(RM) $(SIM)
         $(CXX) $(INCLUDE) $(SIM).C -o $(SIM) $(OBJECTS) $(LIBS) $(FLAGS)
+
+cev: obj
+        $(RM) $(CEV)
+        $(CXX) $(INCLUDE) $(CEV).C -o $(CEV) $(OBJECTS) $(LIBS) $(FLAGS)
 
 python:
@@ -65 +73 @@
         $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(SIM_WRAP).cxx $(FLAGS) -fPIC
         $(CXX) -shared $(INCLUDE) *.o -o _$(SIM).so $(LIBS) $(XML) $(FLAGS) -fPIC
+        $(SWIG) $(CEV).i
+        $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(CEV_WRAP).cxx $(FLAGS) -fPIC
+        $(CXX) -shared $(INCLUDE) *.o -o _$(CEV).so $(LIBS) $(XML) $(FLAGS) -fPIC
 
 obj:
         $(CXX) -c $(INCLUDE) $(SOURCES) $(FLAGS)
+
 clean:
-        $(RM) *~ *.o $(WRAP).cxx $(SGB).py *.pyc
-clean-all:
+        $(RM) *~ *.o *.cxx $(SGB).py *.pyc
 
+clean-all: clean
+        $(RM) *.so $(SIM).py $(SGB).py $(CEV).py
+

simulacion/ModuloDinamico/queries.C

@@ -132 +132 @@
 }
 
-std::string id_to_str(const size_t & id)
+std::string id_to_str(const db_id_t & id)
 {
   std::stringstream sstr;

simulacion/ModuloDinamico/queries.H

@@ -161 +161 @@
  * @return valor del id convertido en cadena.
  */
-std::string id_to_str(const size_t & id);
+std::string id_to_str(const db_id_t & id);