[iss-14]

Squashed commit of the following: commit a734753 Author: Joaquin <[email protected]> Date: Thu Nov 12 18:13:42 2020 -0300 Move graph implementation to a separate folder.
CIFASIS · Nov 12, 2020 · 366abbe · 366abbe
1 parent b62104b
commit 366abbe
Show file tree

Hide file tree

Showing 39 changed files with 131 additions and 130 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -40,7 +40,7 @@ all: lib-gtest $(LIBMODELICA)
 include antialias/Makefile.include
 include mmo/Makefile.include
 include flatter/Makefile.include
-include causalize/Makefile.include
+include causalize/graph_implementation/Makefile.include
 include test/causalize/Makefile.include
 include test/util/Makefile.include
 

diff --git a/antialias/Makefile.include b/antialias/Makefile.include
@@ -9,7 +9,7 @@ SRC_ANTIALIAS := antialias/main.cpp \
 	util/ast_visitors/replace_expression.cpp \
 	util/ast_visitors/replace_equation.cpp \
 	util/ast_visitors/replace_statement.cpp \
-	causalize/state_variables_finder.cpp \
+	util/ast_visitors/state_variables_finder.cpp \
 	antialias/remove_alias.cpp
 
 LIBS=-L./lib -lginac -lmodelica 

diff --git a/antialias/remove_alias.cpp b/antialias/remove_alias.cpp
@@ -24,7 +24,7 @@
 #include <util/ast_visitors/partial_eval_expression.h>
 #include <util/ast_visitors/replace_equation.h>
 #include <util/ast_visitors/replace_statement.h>
-#include <causalize/state_variables_finder.h>
+#include <util/ast_visitors/state_variables_finder.h>
 #include <algorithm>
 #include <vector>
 

diff --git a/causalize/Makefile.include b/causalize/Makefile.include
diff --git a/causalize/graph_implementation/Makefile.include b/causalize/graph_implementation/Makefile.include
@@ -0,0 +1,31 @@
+all: bin/grp_causalize 
+SRC_CAUSALIZE :=  causalize/graph_implementation/main.cpp \
+                  causalize/graph_implementation/for_unrolling/for_index_iterator.cpp \
+                  causalize/graph_implementation/for_unrolling/process_for_equations.cpp \
+                  causalize/graph_implementation/apply_tarjan.cpp \
+                  causalize/graph_implementation/unknowns_collector.cpp \
+                  causalize/graph_implementation/causalization_strategy.cpp \
+                  causalize/graph_implementation/vector/contains_vector.cpp \
+                  causalize/graph_implementation/vector/graph_builder.cpp \
+                  causalize/graph_implementation/vector/causalization_algorithm.cpp \
+                  causalize/graph_implementation/vector/splitfor.cpp \
+                  causalize/graph_implementation/graph/graph_definition.cpp \
+                  util/debug.cpp \
+                  util/table.cpp \
+                  util/type.cpp \
+                  util/solve/solve.cpp \
+                  util/ast_visitors/eval_expression.cpp \
+                  util/ast_visitors/partial_eval_expression.cpp \
+                  util/ast_visitors/ginac_interface.cpp \
+                  util/ast_visitors/contains_expression.cpp \
+                  util/ast_visitors/splitfor_visitor.cpp \
+                  util/ast_visitors/state_variables_finder.cpp \
+                  mmo/mmo_class.cpp
+
+
+OBJS_CAUSALIZE = $(SRC_CAUSALIZE:.cpp=.o)
+-include $(patsubst %,$(DEPDIR)/%.d,$(basename $(SRC_CAUSALIZE)))
+LIB_CAUSALIZE = -L./lib -lmodelica -lginac
+
+bin/grp_causalize: $(OBJS_CAUSALIZE) lib/libmodelica.a
+	$(CXX) $(CXXFLAGS) -o bin/grp_causalize $(OBJS_CAUSALIZE) $(LIB_CAUSALIZE)
diff --git a/causalize/apply_tarjan.cpp → ...ize/graph_implementation/apply_tarjan.cpp b/causalize/apply_tarjan.cpp → ...ize/graph_implementation/apply_tarjan.cpp
@@ -24,7 +24,7 @@
  *      Author: fede
  */
 
-#include <causalize/apply_tarjan.h>
+#include <causalize/graph_implementation/apply_tarjan.h>
 #include <util/debug.h>
 
 #include <boost/property_map/property_map.hpp>

diff --git a/causalize/apply_tarjan.h → ...alize/graph_implementation/apply_tarjan.h b/causalize/apply_tarjan.h → ...alize/graph_implementation/apply_tarjan.h
@@ -27,7 +27,7 @@
 #ifndef APPLY_TARJAN_H_
 #define APPLY_TARJAN_H_
 
-#include <causalize/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
 #include <utility>
 #include <list>
 #include <map>

diff --git a/causalize/causalization_strategy.cpp → ...implementation/causalization_strategy.cpp b/causalize/causalization_strategy.cpp → ...implementation/causalization_strategy.cpp
@@ -24,14 +24,14 @@
  *      Author: fede
  */
 
-#include <causalize/causalization_strategy.h>
-#include <causalize/graph/graph_definition.h>
-#include <causalize/graph/graph_printer.h>
+#include <causalize/graph_implementation/causalization_strategy.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_printer.h>
 #include <ast/ast_types.h>
-#include <causalize/for_unrolling/process_for_equations.h>
+#include <causalize/graph_implementation/for_unrolling/process_for_equations.h>
 #include <util/debug.h>
-#include <causalize/unknowns_collector.h>
-#include <causalize/apply_tarjan.h>
+#include <causalize/graph_implementation/unknowns_collector.h>
+#include <causalize/graph_implementation/apply_tarjan.h>
 #include <boost/lambda/lambda.hpp>
 #include <ast/equation.h>
 #include <boost/variant/get.hpp>

diff --git a/causalize/causalization_strategy.h → ...h_implementation/causalization_strategy.h b/causalize/causalization_strategy.h → ...h_implementation/causalization_strategy.h
@@ -24,7 +24,7 @@
  *      Author: fede
  */
 
-#include <causalize/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
 #include <mmo/mmo_class.h>
 
 namespace Causalize {

diff --git a/...lize/for_unrolling/for_index_iterator.cpp → ...tion/for_unrolling/for_index_iterator.cpp b/...lize/for_unrolling/for_index_iterator.cpp → ...tion/for_unrolling/for_index_iterator.cpp
@@ -17,7 +17,7 @@
 
 ******************************************************************************/
 
-#include <causalize/for_unrolling/for_index_iterator.h>
+#include <causalize/graph_implementation/for_unrolling/for_index_iterator.h>
 #include <ast/expression.h>
 #include <util/ast_visitors/eval_expression.h>
 #include <ast/modification.h>

diff --git a/causalize/for_unrolling/for_index_iterator.h → ...tation/for_unrolling/for_index_iterator.h b/causalize/for_unrolling/for_index_iterator.h → ...tation/for_unrolling/for_index_iterator.h
diff --git a/...e/for_unrolling/process_for_equations.cpp → ...n/for_unrolling/process_for_equations.cpp b/...e/for_unrolling/process_for_equations.cpp → ...n/for_unrolling/process_for_equations.cpp
@@ -25,8 +25,8 @@
 #include <util/table.h>
 #include <util/ast_visitors/partial_eval_expression.h>
 
-#include <causalize/for_unrolling/process_for_equations.h>
-#include <causalize/for_unrolling/for_index_iterator.h>
+#include "process_for_equations.h"
+#include "for_index_iterator.h"
 
 namespace Causalize {
 

diff --git a/...ize/for_unrolling/process_for_equations.h → ...ion/for_unrolling/process_for_equations.h b/...ize/for_unrolling/process_for_equations.h → ...ion/for_unrolling/process_for_equations.h
diff --git a/causalize/graph/graph_definition.cpp → ...implementation/graph/graph_definition.cpp b/causalize/graph/graph_definition.cpp → ...implementation/graph/graph_definition.cpp
@@ -22,7 +22,7 @@
  *      Author: Diego Hollmann
  */
 
-#include <causalize/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
 #include <ast/expression.h>
 #include <boost/variant/get.hpp>
 #include <util/debug.h>

diff --git a/causalize/graph/graph_definition.h → ...h_implementation/graph/graph_definition.h b/causalize/graph/graph_definition.h → ...h_implementation/graph/graph_definition.h
diff --git a/causalize/graph/graph_printer.h → ...raph_implementation/graph/graph_printer.h b/causalize/graph/graph_printer.h → ...raph_implementation/graph/graph_printer.h
@@ -17,7 +17,7 @@
 
 ******************************************************************************/
 
-#include <causalize/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
 #include <list>
 #include <iostream>
 #include <fstream>

diff --git a/causalize/main.cpp → causalize/graph_implementation/main.cpp b/causalize/main.cpp → causalize/graph_implementation/main.cpp
@@ -23,15 +23,15 @@
 #include <ast/equation.h>
 #include <mmo/mmo_class.h>
 #include <util/debug.h>
-#include <causalize/for_unrolling/process_for_equations.h>
-#include <causalize/causalization_strategy.h>
-#include <causalize/vector/causalization_algorithm.h>
-#include <causalize/vector/graph_builder.h>
+#include <causalize/graph_implementation/for_unrolling/process_for_equations.h>
+#include <causalize/graph_implementation/causalization_strategy.h>
+#include <causalize/graph_implementation/vector/causalization_algorithm.h>
+#include <causalize/graph_implementation/vector/graph_builder.h>
 #include <cstdlib>
 #include <stdio.h>
 #include <iostream>
 #include <boost/variant/get.hpp>
-#include <causalize/vector/splitfor.h>
+#include <causalize/graph_implementation/vector/splitfor.h>
 
 using namespace std;
 using namespace Modelica;

diff --git a/causalize/unknowns_collector.cpp → ...aph_implementation/unknowns_collector.cpp b/causalize/unknowns_collector.cpp → ...aph_implementation/unknowns_collector.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <ast/queries.h>
-#include <causalize/unknowns_collector.h>
+#include <causalize/graph_implementation/unknowns_collector.h>
 #include <util/ast_visitors/eval_expression.h>
 #include <util/table.h>
 #include <util/type.h>

diff --git a/causalize/unknowns_collector.h → ...graph_implementation/unknowns_collector.h b/causalize/unknowns_collector.h → ...graph_implementation/unknowns_collector.h
@@ -18,7 +18,7 @@
 ******************************************************************************/
 
 #include <mmo/mmo_class.h>
-#include <causalize/state_variables_finder.h>
+#include <util/ast_visitors/state_variables_finder.h>
 
 using namespace std;
 using namespace Modelica;

diff --git a/causalize/vector/Makefile → ...lize/graph_implementation/vector/Makefile b/causalize/vector/Makefile → ...lize/graph_implementation/vector/Makefile
diff --git a/causalize/graph_implementation/vector/Makefile.include b/causalize/graph_implementation/vector/Makefile.include
@@ -0,0 +1,30 @@
+CAUSALIZE2FLAGS = -DENABLE_DEBUG_MSG
+OBJS_CAUSALIZE2 := $(OBJS_COMMON) \
+            causalize/graph_implementation/causalize2/main.o \
+            mmo/mmo_class.o \
+            util/ast_util.o \
+            util/type.o \
+            util/type_check.o \
+            util/symbol_table.o \
+            util/debug.o \
+			causalize/graph_implementation/causalize2/graph_builder.o \
+			causalize/graph_implementation/causalize2/occurrence_checker.o\
+			causalize/graph_implementation/causalize2/graph_printer.o\
+			causalize/graph_implementation/causalize2/causalization_algorithm.o\
+            causalize/graph_implementation/compref_occurrence.o \
+			causalize/graph_implementation/for_unrolling/for_index_iterator.o\
+            util/solve.o \
+            util/ginac_interface.o \
+            causalize/graph_implementation/state_variables_finder.o \
+            causalize/graph_implementation/unknowns_collector.o \
+			causalize/graph_implementation/causalization_strategy.o\
+            causalize/graph_implementation/cycles_identification_strategy.o \
+            causalize/graph_implementation/for_unrolling/process_for_equations.o
+
+LIB_CAUSALIZE = -lginac
+
+
+bin/causalize2: $(OBJS_CAUSALIZE2)
+	$(CXX) $(CXXFLAGS) -o bin/causalize2 $(OBJS_CAUSALIZE2) $(LIB_CAUSALIZE)
+
+
diff --git a/causalize/vector/causalization_algorithm.cpp → ...tation/vector/causalization_algorithm.cpp b/causalize/vector/causalization_algorithm.cpp → ...tation/vector/causalization_algorithm.cpp
@@ -17,11 +17,11 @@
 
 ******************************************************************************/
 
-#include <causalize/vector/causalization_algorithm.h>
-#include <causalize/vector/vector_graph_definition.h>
+#include <causalize/graph_implementation/vector/causalization_algorithm.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
 #define HAS_COUNT
-#include <causalize/graph/graph_printer.h>
-#include <causalize/for_unrolling/process_for_equations.h>
+#include <causalize/graph_implementation/graph/graph_printer.h>
+#include <causalize/graph_implementation/for_unrolling/process_for_equations.h>
 #include <util/debug.h>
 #include <util/solve/solve.h>
 #include <boost/tuple/tuple.hpp>

diff --git a/causalize/vector/causalization_algorithm.h → ...entation/vector/causalization_algorithm.h b/causalize/vector/causalization_algorithm.h → ...entation/vector/causalization_algorithm.h
@@ -17,7 +17,7 @@
 
 ******************************************************************************/
 
-#include <causalize/vector/vector_graph_definition.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
 #include <mmo/mmo_class.h>
 
 namespace Causalize {

diff --git a/causalize/vector/contains_vector.cpp → ...implementation/vector/contains_vector.cpp b/causalize/vector/contains_vector.cpp → ...implementation/vector/contains_vector.cpp
@@ -17,10 +17,10 @@
 
 ******************************************************************************/
 
-#include <causalize/vector/contains_vector.h>
+#include <causalize/graph_implementation/vector/contains_vector.h>
 #include <util/debug.h>
 #include <boost/variant/get.hpp>
-#include <causalize/vector/vector_graph_definition.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
 #include <util/ast_visitors/eval_expression.h>
 #include <boost/icl/discrete_interval.hpp>
 #include <util/ast_visitors/partial_eval_expression.h>

diff --git a/causalize/vector/contains_vector.h → ...h_implementation/vector/contains_vector.h b/causalize/vector/contains_vector.h → ...h_implementation/vector/contains_vector.h
@@ -20,7 +20,7 @@
 #ifndef AST_VISITOR_CONTAINS_VECTOR
 #define AST_VISITOR_CONTAINS_VECTOR
 #include <boost/variant/static_visitor.hpp>
-#include <causalize/vector/vector_graph_definition.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
 #include <ast/expression.h>
 #include <util/ast_visitors/contains_expression.h>
 #include <boost/icl/discrete_interval.hpp>

diff --git a/causalize/vector/graph_builder.cpp → ...h_implementation/vector/graph_builder.cpp b/causalize/vector/graph_builder.cpp → ...h_implementation/vector/graph_builder.cpp
@@ -17,9 +17,9 @@
 
 ******************************************************************************/
 
-#include <causalize/vector/graph_builder.h>
-#include <causalize/vector/vector_graph_definition.h>
-#include <causalize/vector/contains_vector.h>
+#include <causalize/graph_implementation/vector/graph_builder.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
+#include <causalize/graph_implementation/vector/contains_vector.h>
 #include <util/ast_visitors/eval_expression.h>
 
 #include <boost/graph/adjacency_list.hpp>

diff --git a/causalize/vector/graph_builder.h → ...aph_implementation/vector/graph_builder.h b/causalize/vector/graph_builder.h → ...aph_implementation/vector/graph_builder.h
@@ -25,8 +25,8 @@
  * implementations.
  */
 #include <mmo/mmo_class.h>
-#include <causalize/vector/vector_graph_definition.h>
-#include <causalize/state_variables_finder.h>
+#include <causalize/graph_implementation/vector/vector_graph_definition.h>
+#include <util/ast_visitors/state_variables_finder.h>
 
 namespace Causalize {
 class ReducedGraphBuilder {

diff --git a/causalize/vector/splitfor.cpp → .../graph_implementation/vector/splitfor.cpp b/causalize/vector/splitfor.cpp → .../graph_implementation/vector/splitfor.cpp
@@ -21,8 +21,8 @@
 #include <ast/queries.h>
 #include <boost/variant/get.hpp>
 #include <util/ast_visitors/splitfor_visitor.h>
-#include <causalize/state_variables_finder.h>
-#include <causalize/vector/splitfor.h>
+#include <util/ast_visitors/state_variables_finder.h>
+#include <causalize/graph_implementation/vector/splitfor.h>
 #include <algorithm>
 #include <vector>
 

diff --git a/causalize/vector/splitfor.h → ...ze/graph_implementation/vector/splitfor.h b/causalize/vector/splitfor.h → ...ze/graph_implementation/vector/splitfor.h
diff --git a/causalize/vector/vector_graph_definition.h → ...entation/vector/vector_graph_definition.h b/causalize/vector/vector_graph_definition.h → ...entation/vector/vector_graph_definition.h
@@ -28,7 +28,7 @@
 
 #include <ast/equation.h>
 #include <mmo/mmo_class.h>
-#include <causalize/graph/graph_definition.h>
+#include <causalize/graph_implementation/graph/graph_definition.h>
 
 namespace Causalize {
 /// @brief This is the property for a vertex in the incidence graph. Nodes can be of two types: Equation or Unknow.

diff --git a/causalize/vector/Makefile.include b/causalize/vector/Makefile.include