e153da5572
The ColPack library is required to enable the full functionality of the adolc library. In older versions it used to be compiled within the adolc package itself. With version 1.0.6 the ColPack library has now aquired its own build system, so we can now package it in its own package. I shall follow up this sr with a sr to the adolc package, which will remove the old version of ColPack from that package and use this one for building. OBS-URL: https://build.opensuse.org/request/show/110668 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/ColPack?expand=0&rev=1
93 lines
2.5 KiB
Diff
93 lines
2.5 KiB
Diff
diff --git a/GraphColoring/GraphColoring.cpp b/GraphColoring/GraphColoring.cpp
|
|
index 02f4c82..0125c72 100755
|
|
--- a/GraphColoring/GraphColoring.cpp
|
|
+++ b/GraphColoring/GraphColoring.cpp
|
|
@@ -675,6 +675,7 @@ namespace ColPack
|
|
cout<<endl;
|
|
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::PrintPotentialHub(map< int, int> *PotentialHub_Private, int i_thread_num, pair<int, int> pii_ColorCombination) {
|
|
@@ -696,6 +697,7 @@ namespace ColPack
|
|
cout<<endl;
|
|
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
|
|
@@ -1129,6 +1131,7 @@ namespace ColPack
|
|
pii_pair.second = mii_iter->second; // if pii_pair.second < -1, then mii_iter->first is a leaf and its hub can be calculated as [-(pii_pair.second+2)]
|
|
Vertex2ColorCombination_Private[i_thread_num][ mii_iter->first ].push_back(pii_pair);
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
|
|
@@ -1325,6 +1328,7 @@ namespace ColPack
|
|
if( i_ElementCount >= i_MaxElementsOfCombination) break;
|
|
}
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::PrintAllColorCombination(map< pair<int, int>, Colors2Edge_Value , lt_pii>* Colors2Edge_Private, int i_MaxNumThreads, int i_MaxNumOfCombination, int i_MaxElementsOfCombination) {
|
|
@@ -1566,6 +1570,7 @@ namespace ColPack
|
|
for(;mib_itr != D1Colors[i_thread_num].end(); mib_itr++) {
|
|
cout<<flush<<"\t color "<<mib_itr->first<<"; count "<<mib_itr->second<<endl;
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::PrintForbiddenColors(map<int, bool>* mip_ForbiddenColors,int i_thread_num) {
|
|
@@ -1575,6 +1580,7 @@ namespace ColPack
|
|
cout<< itr->first<<", ";
|
|
}
|
|
cout<<endl;
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::PrintSubGraph(map< int, map<int,bool> > *graph) {
|
|
@@ -1588,6 +1594,7 @@ namespace ColPack
|
|
}
|
|
cout<<endl;
|
|
}
|
|
+ return(_TRUE);
|
|
|
|
}
|
|
|
|
@@ -1861,6 +1868,7 @@ namespace ColPack
|
|
}
|
|
cout<<endl;
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::BuildForbiddenColors(int i_MaxNumThreads, int i_thread_num, int i_CurrentVertex, map<int, bool>* mip_ForbiddenColors, map<int, int>* D1Colors, vector< map <int, int > > *Vertex2ColorCombination) {
|
|
@@ -1937,6 +1945,7 @@ namespace ColPack
|
|
}
|
|
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::StarColoring_serial2() {
|
|
@@ -2275,6 +2284,7 @@ namespace ColPack
|
|
}
|
|
}
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
int GraphColoring::PrintVertex2ColorCombination_raw (vector< map <int, int > > *Vertex2ColorCombination) {
|
|
@@ -2286,6 +2296,7 @@ namespace ColPack
|
|
cout<<"\t Vertex2ColorCombination["<< i <<"][] "<<mii_iter->second<<" c "<<mii_iter->first<<endl;
|
|
}
|
|
}
|
|
+ return(_TRUE);
|
|
}
|
|
|
|
|