Rational priced DBM

CMakeLists.txt

@@ -6,6 +6,8 @@ include(GNUInstallDirs)
 option(TESTING OFF)
 option(STATIC OFF)
 
+set(CMAKE_BUILD_TYPE Debug)
+
 cmake_policy(SET CMP0048 NEW) # project() command manages VERSION variables
 set(CMAKE_CXX_STANDARD 17)
 set(UDBM_PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
@@ -14,17 +16,25 @@ set(ENABLE_STORE_MINGRAPH 1)
 CONFIGURE_FILE("src/config.h.cmake" "include/dbm/config.h")
 
 set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${CMAKE_CURRENT_SOURCE_DIR}/libs")
+find_package(doctest 2.4.11 REQUIRED)
 find_package(xxHash 0.8.0 CONFIG REQUIRED)
 find_package(UUtils 1.1.1 REQUIRED COMPONENTS base hash debug)
 
-add_library(UDBM src/DBMAllocator.cpp src/dbm.c src/fed_dbm.cpp src/mingraph.c src/mingraph_read.c src/partition.cpp src/print.cpp src/gen.c src/mingraph_cache.cpp src/mingraph_relation.c src/pfed.cpp src/fed.cpp src/infimum.cpp src/mingraph_equal.c src/mingraph_write.c src/priced.cpp)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs)
+
+add_library(UDBM src/DBMAllocator.cpp src/dbm.c src/fed_dbm.cpp src/mingraph.c src/mingraph_read.c src/partition.cpp src/print.cpp src/gen.c src/mingraph_cache.cpp src/mingraph_relation.c src/pfed.cpp src/fed.cpp src/infimum.cpp src/mingraph_equal.c src/mingraph_write.c src/priced.cpp src/cost_type.cpp)
 target_link_libraries(UDBM UUtils::base UUtils::udebug UUtils::hash)
 
 if(STATIC)
 	set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++ -lwsock32 -lws2_32 ${CMAKE_CXX_STANDARD_LIBRARIES}")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
 endif(STATIC)
 
+
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+
+
 target_include_directories(UDBM
     PRIVATE
         # where the library itself will look for its internal headers

getlibs.sh

@@ -35,3 +35,20 @@ cd build
 cmake $CMAKE_ARGS -DCMAKE_INSTALL_PREFIX="$SOURCE_DIR/libs/UUtils" ..
 cmake --build . --config Release
 cmake --install . --config Release
+
+cd $SOURCE_DIR/libs/sources;
+wget -nc https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz
+tar -xvf boost_1_81_0.tar.gz
+mkdir -p "$SOURCE_DIR/libs/sources/boost_1_81_0/build"
+cd "$SOURCE_DIR/libs/sources/boost_1_81_0/build"
+cp -r "$SOURCE_DIR/libs/sources/boost_1_81_0/boost" "$SOURCE_DIR/libs/"
+
+cd $SOURCE_DIR/libs/sources;
+wget https://github.com/doctest/doctest/archive/refs/tags/v2.4.11.tar.gz
+tar -xvf v2.4.11.tar.gz
+mkdir -p "$SOURCE_DIR/libs/sources/doctest-2.4.11/build"
+cd "$SOURCE_DIR/libs/sources/doctest-2.4.11"
+cd build
+cmake $CMAKE_ARGS -DOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=ON -DDOCTEST_USE_STD_HEADERS=ON -DCMAKE_INSTALL_PREFIX="$SOURCE_DIR/libs" ..
+cmake --build . --config Release
+cmake --install . --config Release

include/dbm/cost_type.h

@@ -0,0 +1,18 @@
+//
+// Created by ragusa on 3/17/23.
+//
+
+#ifndef UDBM_COST_TYPE_H
+#define UDBM_COST_TYPE_H
+
+#include <boost/rational.hpp>
+
+/**
+ * The type used to represent cost in the pdbm
+ */
+typedef boost::rational<int> CostType;
+const CostType INFINITE_COST = (CostType)INT_MAX;
+
+uint32_t hash_cost_type(const CostType& val);
+
+#endif  // UDBM_COST_TYPE_H

include/dbm/fed.h

@@ -955,6 +955,9 @@ namespace dbm
         fed_t& unionWith(fed_t& arg);
         fed_t& unionWithC(fed_t arg);  // dummy wrapper
 
+        // Performs unionWith operation and returns whether the fed changed
+        bool unionWithChanged(const fed_t& arg);
+
         /// Simply add (list concatenation) DBMs to this federation.
         /// @pre same dimension.
 

include/dbm/inline_fed.h

@@ -512,6 +512,12 @@ namespace dbm
             return *this;
         }
 
+        bool unionWithChanged(dbmlist_t& arg) {
+            removeIncluded(arg);
+            append(arg);
+            return arg.size() > 0;
+        }
+
         /// Simple reduction by inclusion check of DBMs.
         void reduce(cindex_t dim);
 

include/dbm/partition.h

@@ -15,6 +15,7 @@
 #define INCLUDE_DBM_PARTITION_H
 
 #include "dbm/fed.h"
+#include "dbm/pfed.h"
 #include "base/intutils.h"
 
 /**