Build with sharedmeataxe and tdlib support.

Use local objects.inv when building documentation.
This commit is contained in:
Jerry James 2020-01-09 19:18:28 -07:00
parent 4f4f23c8e6
commit 44047e4277
7 changed files with 283 additions and 112 deletions

27
sagemath-tdlib.patch Normal file
View file

@ -0,0 +1,27 @@
--- src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp.orig 2019-09-29 17:03:11.000000000 -0600
+++ src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp 2020-01-06 10:58:12.087355771 -0700
@@ -2,8 +2,8 @@
#include <map>
#include <boost/graph/adjacency_list.hpp>
-#include "tdlib/TD_combinations.hpp"
-#include "tdlib/TD_misc.hpp"
+#include <treedec/combinations.hpp>
+#include <treedec/misc.hpp>
#ifndef TD_STRUCT_VERTEX
#define TD_STRUCT_VERTEX
@@ -16,13 +16,6 @@ struct Vertex{
typedef boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS, Vertex> TD_graph_t;
-struct bag{
- std::set<unsigned int> bag;
-};
-
-typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS, bag> TD_tree_dec_t;
-
-
void make_tdlib_graph(TD_graph_t &G, std::vector<unsigned int> &V, std::vector<unsigned int> &E){
unsigned int max = 0;
for(unsigned int i = 0; i < V.size(); i++)