diff --git a/.gitmodules b/.gitmodules index 4109d453..5ab27155 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,8 @@ [submodule "eigen"] path = eigen url = https://gitlab.com/libeigen/eigen.git + branch = 3.3 [submodule "volesti"] path = volesti url = https://github.com/GeomScale/volesti.git - branch = volesti4dingo + branch = develop diff --git a/dingo/bindings/bindings.h b/dingo/bindings/bindings.h index eb183cd7..62cf8003 100644 --- a/dingo/bindings/bindings.h +++ b/dingo/bindings/bindings.h @@ -40,7 +40,6 @@ #include "preprocess/min_sampling_covering_ellipsoid_rounding.hpp" #include "preprocess/svd_rounding.hpp" #include "preprocess/max_inscribed_ellipsoid_rounding.hpp" -#include "preprocess/get_full_dimensional_polytope.hpp" typedef double NT; typedef Cartesian Kernel; @@ -153,10 +152,10 @@ class HPolytopeCPP{ void get_polytope_as_matrices(double* new_A, double* new_b) const; // the rounding() function - void apply_rounding(int rounding_method, double* new_A, double* new_b, double* T_matrix, + void apply_rounding(int rounding_method, double* new_A, double* new_b, double* T_matrix, double* shift, double &round_value, double* inner_point, double radius); - + }; -#endif +#endif diff --git a/eigen b/eigen index 53a7864c..02f42001 160000 --- a/eigen +++ b/eigen @@ -1 +1 @@ -Subproject commit 53a7864c48a2b2fc226c69e9184d7cc8e6b36b6d +Subproject commit 02f420012a169ed9267a8a78083aaa588e713353 diff --git a/volesti b/volesti index 47ed5581..93bbc500 160000 --- a/volesti +++ b/volesti @@ -1 +1 @@ -Subproject commit 47ed55817a053124facc425df251a939fccf3070 +Subproject commit 93bbc5008b8ec4682fd20702e0531e4dc889e963