mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-21 11:19:02 -04:00
2fac775552
Also: - Drop upstreamed -ecm and -primecount patches. - Add -escape patch. - The old notebook (sagenb) is no longer shipped, so drop the -sagenb and -sagenb-python3 patches, the -notebook subpackage, and some BRs. - New -jupyter subpackage. - Add suitesparse BR. - Drop pathlib2 BR (bz 1797116).
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
diff -up src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp.orig src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp
|
|
--- src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp.orig 2020-01-01 04:03:10.000000000 -0700
|
|
+++ src/sage/graphs/graph_decompositions/tdlib/sage_tdlib.cpp 2020-02-25 13:59:23.612853911 -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++)
|