[iss-72]

Squashed commit of the following:

commit 4a6458e
Author: joaquin.f.fernandez <[email protected]>
Date:   Wed Jul 3 14:08:44 2024 -0300

    [iss-71]
    Squashed commit of the following:

    commit a832320
    Author: joaquin.f.fernandez <[email protected]>
    Date:   Wed Jul 3 14:04:43 2024 -0300

        [iss-75]
        Squashed commit of the following:

        commit d8125a1
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 13:34:01 2024 -0300

            Keep causalize test empty rule.

        commit 4505341
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 12:00:18 2024 -0300

            Update Doxyfile.

        commit e2c3069
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 11:25:10 2024 -0300

            Update sbg causalization makefile.

        commit 283013e
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 11:24:46 2024 -0300

            Fixed main makefile rules.

        commit 63d0cfe
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 11:24:07 2024 -0300

            Restore connections id method call.

        commit be6e3a5
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Wed Jul 3 11:23:17 2024 -0300

            Updated sbg 1.0.0 lib.

        commit 255c820
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 14:11:55 2024 -0300

            p
             Please enter the commit message for your changes. Lines starting
            rkflow file.

        commit d75a3ca
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 12:02:40 2024 -0300

            Update sbg boost include prefix.

        commit ba17343
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:51:11 2024 -0300

            Update sbg implementation make rules.

        commit c3cf870
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:50:37 2024 -0300

            Added rules for legacy sbg lib.

        commit 4d28eb9
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:50:19 2024 -0300

            Add dummy main for sbg implementation.

        commit c762c23
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:49:10 2024 -0300

            Fix flatter id method call.

        commit cb053b4
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:48:51 2024 -0300

            Fix solve compilation error.

        commit 8ee5150
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:48:10 2024 -0300

            Update flatter makefile.

        commit 1ac50c1
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 11:04:46 2024 -0300

            Update gitignore.

        commit 3f9b537
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 10:56:47 2024 -0300

            Update gitignore.

        commit 63e8ea7
        Author: joaquin.f.fernandez <[email protected]>
        Date:   Tue Jul 2 10:43:41 2024 -0300

            Added sbg version 1 for legacy code.

    commit d625aa1
    Author: joaquin.f.fernandez <[email protected]>
    Date:   Tue Jul 2 10:33:39 2024 -0300

        Update config files.

    commit 1ea268e
    Author: joaquin.f.fernandez <[email protected]>
    Date:   Tue Jul 2 10:29:34 2024 -0300

        Add/modified makefiles rules.

    commit 8c95ced
    Author: joaquin.f.fernandez <[email protected]>
    Date:   Tue Jul 2 10:23:13 2024 -0300

        Updated gitignore.

    commit 38dee92
    Author: joaquin.f.fernandez <[email protected]>
    Date:   Tue Jul 2 10:21:43 2024 -0300

        Added boost 1.81 source files.

commit 8b75e93
Author: joaquin.f.fernandez <[email protected]>
Date:   Tue Jun 25 15:17:43 2024 -0300

    Update causalize makefile.

commit fabca43
Author: joaquin.f.fernandez <[email protected]>
Date:   Tue Jun 25 15:14:29 2024 -0300

    Remove legacy code.

.github/workflows/c-cpp.yml

@@ -22,7 +22,8 @@ jobs:
         sudo apt-get install g++
         sudo apt-get install libginac-dev
         sudo apt-get install make
-          
+        sudo apt-get install rapidjson-dev
+
     - name: Autoconf
       working-directory: .
       run: autoconf
@@ -33,7 +34,7 @@ jobs:
 
     - name: SBG
       working-directory: .
-      run: make update-lib-sbg repo_checkout=https 
+      run: make update-sbg repo_checkout=https 
 
     - name: Build
       working-directory: .

.gitignore

@@ -15,8 +15,10 @@ configure
 
 # 3rd-party files.
 /3rd-party/gtest/usr/*
+/3rd-party/sbg/sb-graph-dev.tar.gz
 /3rd-party/sbg/sb-graph-dev
-/3rd-party/sbg/*.tar.gz
+/3rd-party/sbg/sb-graph-1.0.0
+/3rd-party/boost/boost-1.81.0/
 
 # Test generated files.
 /flatter/test/test_data/*

.vscode/settings.json

@@ -24,6 +24,7 @@
         "tuple": "cpp",
         "type_traits": "cpp",
         "utility": "cpp",
-        "iostream": "cpp"
+        "iostream": "cpp",
+        "thread": "cpp"
     }
 }

Doxyfile

@@ -693,7 +693,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       = */3rd-party/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the 

Makefile.in

@@ -18,23 +18,32 @@ AST_DIR         := ast
 PARSER_DIR      := parser
 SBG_LIB         := sbg
 SBG_DEV         := sb-graph-dev
+SBG_1_0_0       := sb-graph-1.0.0
+BOOST_LIB_PATH  := $(3RD_PARTY_DIR)/boost
+BOOST_1_81      := boost-1.81.0
+BOOST_1_81_LIB  := $(BOOST_1_81).tar.xz
+BOOST_1_81_INC  := -I$(BOOST_LIB_PATH)/$(BOOST_1_81)/include
+
 
 # Flags, Libraries and Includes
-INCLUDES := -I. -I$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV)/usr/include 
-CXXFLAGS := -std=c++17 -Wall -Werror -Wno-reorder -O3 
+SBG_LIB_DEV_INCLUDE := -I$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV)/usr/include
+SBG_LIB_1_0_0_INCLUDE := -I$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0)/usr/include
+INCLUDES := -I.
+CXXFLAGS := -std=c++17 -Wall  -Wno-reorder -O3 
 ifeq ($(MODE),Debug)
 CXXFLAGS 	+= -ggdb  
 endif
 LIBMODELICA = lib/libmodelica.a
-LIBS     := -L./lib -L$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV)/usr/lib -lsbgraph -lginac -lmodelica
+LIBS     := -L./lib -lginac -lmodelica
+SBG_LIB_DEV_LINK := -L$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV)/usr/lib -lsbgraph
+SBG_LIB_1_0_0_LINK := -L$(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0)/usr/lib -lsbgraph
 
 all: $(LIBMODELICA)
 
 include antialias/Makefile.include
 include mmo/Makefile.include
 include flatter/Makefile.include
 include causalize/Makefile.include
-include test/causalize/Makefile.include
 
 # Sources
 COMMON_SRC := \
@@ -57,23 +66,36 @@ COMMON_SRC := \
 COMMON_OBJ=$(addprefix $(BUILD_DIR)/, $(COMMON_SRC:.cpp=.o))
 
 $(BUILD_DIR)/%.o : %.cpp
-	$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
-	$(CC) $(INCLUDES) -c $< -o $@ $(CXXFLAGS)
+	$(CC) $(INCLUDES) $(SBG_LIB_1_0_0_INCLUDE) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
+	$(CC) $(INCLUDES) $(SBG_LIB_1_0_0_INCLUDE) -c $< -o $@ $(CXXFLAGS)
 
 $(COMMON_OBJ): | create-folders
 
-update-lib-sbg:
-	cd $(3RD_PARTY_DIR)/$(SBG_LIB); ./update.py --branch_name $(sbg_branch) --repo_checkout $(repo_checkout)
-	cd $(3RD_PARTY_DIR)/$(SBG_LIB); tar xvzf $(SBG_DEV).tar.gz
+lib-boost:
+ifeq ("$(wildcard $(BOOST_LIB_PATH)/$(BOOST_1_81))","")
+	cd $(BOOST_LIB_PATH); tar -xvf $(BOOST_1_81_LIB)
+endif
 
-lib-sbg:
+update-sbg:
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB); ./update.py --branch_name $(sbg_branch) --repo_checkout $(repo_checkout)
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB); tar -zxvf $(SBG_DEV).tar.gz
+
+lib-sbg: lib-boost  
+ifeq ("$(wildcard $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0))","")
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB); tar -zxvf $(SBG_1_0_0).tar.gz
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0); autoconf
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0); ./configure
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0); make
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0); mkdir -p usr
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_1_0_0); make install prefix=./usr
+endif
 ifeq ("$(wildcard $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV))","")
-	make update-lib-sbg
+	make update-sbg
 endif
 ifeq ($(build_sbg), True)
-	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); autoconf 
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); autoconf
 	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); ./configure
-	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); make
+	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); make boost_libdir=../../boost/$(BOOST_1_81)
 	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); mkdir -p usr
 	cd $(3RD_PARTY_DIR)/$(SBG_LIB)/$(SBG_DEV); make install prefix=./usr
 endif

causalize/Makefile.include

@@ -33,6 +33,4 @@ create-folders::
 	@mkdir -p $(BUILD_DIR)/$(UTIL_DIR)/solve    
 	@mkdir -p $(BUILD_DIR)/$(MMO_DIR)
 
-include causalize/graph_implementation/Makefile.include
-include causalize/vg_implementation/Makefile.include
 include causalize/sbg_implementation/Makefile.include