Changeset b99fc8d in observatorio for simulacion/ModuloDinamico

Timestamp:

Nov 13, 2014, 4:51:58 PM (10 years ago)

Author:

Alejandro <amujica@…>

Branches:

simulacion

Children:

19dd423

Parents:

b4ef605

Message:

Modulo python para construccion de la red en t0

Location:

simulacion/ModuloDinamico

Files:

• Makefile (modified) (3 diffs)
• sigesic_graph_builder.C (added)
• sigesic_graph_builder.H (added)
• sigesic_graph_builder.i (added)

simulacion/ModuloDinamico/Makefile

@@ -7 +7 @@
 XML = `pkg-config libxml++-2.6 --cflags --libs`
 
-CXX = g++ -O3 -g 
+CXX = g++ -std=c++0x -O3 -g 
+
+SWIG = swig -python -c++
+
+PYTHONPATH = /usr/include
+
+#PYTHONINC = $(PYTHONPATH)/python2.6
+PYTHONINC = $(PYTHONPATH)/python2.7
 
 WARN = -Wall -Wextra -Wcast-align -Wno-sign-compare -Wno-write-strings \
        -Wno-parentheses -Wno-unused-function
 
-FLAGS = -std=c++0x -DDEBUG -D_GLIBCXX__PTHREADS $(WARN) $(XML)
+FLAGS = -DDEBUG -DWITHOUT_NANA -D_GLIBCXX__PTHREADS $(WARN) $(XML)
 
 INCLUDE = -I $(ALEPH) -I . -I $(DB) -I $(PQ)
@@ -18 +25 @@
 LIBS = -L $(ALEPH) -L $(DB) -L $(PQ) -lAleph -lpq -lDbAccess -lnana -lc -lm \
                                      -lgsl -lgslcblas -lpthread
+
+CP = cp -f
                    
 TEST = test
+
+SIM = simulator
+
+SGB = sigesic_graph_builder
+
+WRAP = $(SGB)_wrap
 
 SOURCES = good.C product.C input.C imported_product.C ip_relationship.C \
@@ -27 +42 @@
           io_manager.o queries.o utils.o exogenous_variables.o
 
+sim: obj
+        $(RM) $(SIM)
+        $(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) -shared $(INCLUDE) *.o -o _$(SGB).so $(LIBS) $(XML) $(FLAGS) -fPIC
+
 obj:
         $(CXX) -c $(INCLUDE) $(SOURCES) $(FLAGS)
 clean:
-        $(RM) *~ *.o
+        $(RM) *~ *.o $(WRAP).cxx $(SGB).py *.pyc
 clean-all:
+