Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dingo to use volesti develop instead of volesti4dingo branch #87

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions dingo/bindings/bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<NT> Kernel;
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion eigen
Submodule eigen updated from 53a786 to 02f420
2 changes: 1 addition & 1 deletion volesti
Submodule volesti updated 388 files
Loading