Changeset 8eb9820 in observatorio for simulacion/ModuloDinamico

Timestamp:

Dec 1, 2014, 4:48:25 PM (9 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

b208550

Parents:

d7fc465

Message:

Creado el modulo python para el simulador

Location:

simulacion/ModuloDinamico

Files:

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

simulacion/ModuloDinamico/Makefile

@@ -7 +7 @@
 XML = `pkg-config libxml++-2.6 --cflags --libs`
 
-#CXX = g++ -std=c++0x -O3
-CXX = g++ -std=c++0x -O0 -g
+CXX = g++ -std=c++0x -O3
+#CXX = g++ -std=c++0x -O0 -g
 
 SWIG = swig -python -c++
@@ -20 +20 @@
        -Wno-parentheses -Wno-unused-function
 
-FLAGS =  #-DWITHOUT_NANA
+FLAGS =  -DWITHOUT_NANA
 
 FLAGS += -DDEBUG -D_GLIBCXX__PTHREADS $(WARN) $(XML)
@@ -38 +38 @@
 SGB = sigesic_graph_builder
 
-WRAP = $(SGB)_wrap
+SGB_WRAP = $(SGB)_wrap
+SIM_WRAP = $(SIM)_wrap
 
 SOURCES = good.C product.C input.C imported_product.C ip_relationship.C \
-          io_manager.C queries.C utils.C exogenous_variables.C
+          io_manager.C queries.C utils.C exogenous_variables.C simulator.C
 
 OBJECTS = good.o product.o input.o imported_product.o ip_relationship.o \
-          io_manager.o queries.o utils.o exogenous_variables.o
+          io_manager.o queries.o utils.o exogenous_variables.o simulator.o
+
+test: obj
+        $(RM) $(TEST)
+        $(CXX) $(INCLUDE) $(TEST).C -o $(TEST) $(OBJECTS) $(LIBS) $(FLAGS)
 
 sim: obj
@@ -50 +55 @@
         $(CXX) $(INCLUDE) $(SIM).C -o $(SIM) $(OBJECTS) $(LIBS) $(FLAGS)
 
-test: obj
-        $(RM) $(TEST)
-        $(CXX) $(INCLUDE) $(TEST).C -o $(TEST) $(OBJECTS) $(LIBS) $(FLAGS)
-
 python:
         $(CXX) -c $(INCLUDE) $(SOURCES) $(FLAGS) -fPIC
         $(CXX) -c $(INCLUDE) $(SGB).C $(FLAGS) -fPIC
         $(SWIG) $(SGB).i
-        $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(WRAP).cxx $(FLAGS) -fPIC
+        $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(SGB_WRAP).cxx $(FLAGS) -fPIC
         $(CXX) -shared $(INCLUDE) *.o -o _$(SGB).so $(LIBS) $(XML) $(FLAGS) -fPIC
+        $(CXX) -c $(INCLUDE) $(SIM).C $(FLAGS) -fPIC
+        $(SWIG) $(SIM).i
+        $(CXX) -c $(INCLUDE) -I $(PYTHONINC) $(SIM_WRAP).cxx $(FLAGS) -fPIC
+        $(CXX) -shared $(INCLUDE) *.o -o _$(SIM).so $(LIBS) $(XML) $(FLAGS) -fPIC
 
 obj:

simulacion/ModuloDinamico/simulator.C

@@ -983 +983 @@
 }
 
-/* Función principal temporal para pruebas del simulador, se eliminará al
-   generar el módulo para Python.
-*/
-int main()
-{
-  return simulate("sim.xml", "sim_result.xml");
-}
-

simulacion/ModuloDinamico/simulator.H

@@ -56 +56 @@
 typedef List<Level *> Rank_Type;
 
+int simulate(const char * const, const char * const);
+
 # endif // SIMULATOR_H