Commit 2f66446

committed

Define macro for uncolored nodes

1 parent 556b378 commit 2f66446Copy full SHA for 2f66446

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ namespace graph_colouring {`
`44`	`44`	`/**`
`45`	`45`	`* Represents a colouring of a specific graph where`
`46`	`46`	`* config[n] = c means that color c is associated to node with node id n`
`47`		`- * Use config[n] = std::numeric_limits<Color>::max() to mark node n as uncoloured`
	`47`	`+ * Use config[n] = UNCOLORED or config[n] = std::numeric_limits<Color>::max()`
	`48`	`+ * to mark node n as uncoloured`
`48`	`49`	`*/`
`49`	`50`	`typedef std::vector<Color> Colouring;`
`50`	`51`
`@@ -111,7 +112,7 @@ namespace graph_colouring {`
`111`	`112`	`inline size_t numberOfUncolouredNodes(const Colouring &s) {`
`112`	`113`	`size_t count = 0;`
`113`	`114`	`for (auto n : s) {`
`114`		`- if (n == std::numeric_limits<Color>::max()) {`
	`115`	`+ if (n == UNCOLORED) {`
`115`	`116`	`count++;`
`116`	`117`	`}`
`117`	`118`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ typedef uint32_t NodeID;`
`32`	`32`	`typedef uint32_t EdgeID;`
`33`	`33`	`typedef uint32_t Color;`
`34`	`34`
	`35`	`+#define UNCOLORED std::numeric_limits<Color>::max()`
	`36`	`+`
`35`	`37`	`struct Node {`
`36`	`38`	`EdgeID firstEdge;`
`37`	`39`	`};`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace graph_colouring {`
`44`	`44`	`std::vector<bool> usedColor(s.size());`
`45`	`45`	`size_t color_count = 0;`
`46`	`46`	`for (auto n : s) {`
`47`		`- if (n != std::numeric_limits<Color>::max() && !usedColor[n]) {`
	`47`	`+ if (n != UNCOLORED && !usedColor[n]) {`
`48`	`48`	`usedColor[n] = true;`
`49`	`49`	`color_count++;`
`50`	`50`	`}`
`@@ -229,10 +229,10 @@ namespace graph_colouring {`
`229`	`229`
`230`	`230`	`//Represents the smallest number of colors used in a recently found colouring`
`231`	`231`	`std::atomic<size_t> target_k(k);`
`232`		`- boost::lockfree::queue<WorkingPackage> workQueue(populationSize * strategies.size() * k);`
	`232`	`+ boost::lockfree::queue<WorkingPackage> workQueue(populationSize * strategies.size());`
`233`	`233`
`234`	`234`	`//It is possible that all threads report the same found k colouring`
`235`		`- boost::lockfree::queue<MasterPackage> masterQueue(k * threadCount);`
	`235`	`+ boost::lockfree::queue<MasterPackage> masterQueue(k);`
`236`	`236`
`237`	`237`	`//Used to signal the termination of the worker pool`
`238`	`238`	`std::atomic<bool> terminated(false);`

Comments

(0)