Commit a17a2ac

committed

compiling with g++ 7.4

1 parent 4de0932 commit a17a2acCopy full SHA for a17a2ac

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`// with a basic text user interface for all algorithms.`
`10`	`10`	`//`
`11`	`11`
	`12`	`+#include "dvector.h"`
`12`	`13`	`#include "scc.h"`
`13`	`14`	`#include "dfs.h"`
`14`	`15`	`#include "mst.h"`

Lines changed: 2 additions & 1 deletion

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,13 @@ namespace MST {`
`47`	`47`	`virtual void build() = 0;`
`48`	`48`	`bool nodePartOfMST(const basicGraph::bNode* gnode)`
`49`	`49`	`{`
`50`		`- return tree_.find(&treeNode(gnode)) != tree_.end();`
	`50`	`+ treeNode tmpTreeNode = treeNode(gnode);`
	`51`	`+ return tree_.find(&tmpTreeNode) != tree_.end();`
`51`	`52`	`}`
`52`	`53`	`treeNode* getTreeNode(const basicGraph::bNode* gnode)`
`53`	`54`	`{`
`54`		`- set<treeNode*, treeNodeCompare>::iterator niter = tree_.find(&treeNode(gnode));`
	`55`	`+ treeNode tmpTreeNode = treeNode(gnode);`
	`56`	`+ set<treeNode*, treeNodeCompare>::iterator niter = tree_.find(&tmpTreeNode);`
`55`	`57`	`return niter == tree_.end() ? nullptr : *niter;`
`56`	`58`	`}`
`57`	`59`	`void print(bool edges_only=false)`
`@@ -177,8 +179,10 @@ namespace MST {`
`177`	`179`	`{`
`178`	`180`	`const basicGraph::bNode* u = sortedEdges[i]->n1();`
`179`	`181`	`const basicGraph::bNode* v = sortedEdges[i]->n2();`
`180`		`- auto uset = tree_.find(&treeNode(u));`
`181`		`- auto vset = tree_.find(&treeNode(v));`
	`182`	`+ treeNode tmpUNode = treeNode(u);`
	`183`	`+ treeNode tmpVNode = treeNode(v);`
	`184`	`+ auto uset = tree_.find(&tmpUNode);`
	`185`	`+ auto vset = tree_.find(&tmpVNode);`
`182`	`186`	`if (uset != tree_.end() && vset != tree_.end() &&`
`183`	`187`	`(uset)->iset_ != (vset)->iset_ )`
`184`	`188`	`{`
`@@ -297,4 +301,5 @@ namespace MST {`
`297`	`301`	`};`
`298`	`302`	`}`
`299`	`303`
`300`		`-#endif GRAPH_MST_H`
	`304`	`+#endif`
	`305`	`+`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ namespace short_paths {`
`68`	`68`	`pathNode* src() { return src_; }`
`69`	`69`	`pathNode* retrievePathNode(const basicGraph::bNode* gnode)`
`70`	`70`	`{`
`71`		`- set<pathNode*, pathNodeCompare>::iterator niter = tree_.find(&pathNode(gnode));`
	`71`	`+ pathNode tmpNode = pathNode(gnode);`
	`72`	`+ set<pathNode*, pathNodeCompare>::iterator niter = tree_.find(&tmpNode);`
`72`	`73`	`return niter == tree_.end() ? nullptr : *niter;`
`73`	`74`	`}`
`74`	`75`	`pathNode* retrieveOrAddPathNode(const basicGraph::bNode* gnode)`
`@@ -405,4 +406,4 @@ namespace short_paths {`
`405`	`406`	`};`
`406`	`407`	`}`
`407`	`408`
`408`		`-#endif`
	`409`	`+#endif`

Comments

(0)