Accepting request 540488 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/540488 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ColPack?expand=0&rev=9factory
Dominique Leuenberger
6 years ago
committed by
Git OBS Bridge
commit
f81fcfd1e6
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b22ead7da80fa1735291b2d83198adf41bf36101e4fcb2c4f07c1cfacf211c75
|
||||
size 658087
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:06c5d3e61ab873b27d7962a9f09e90cbc52ccd9f480e88f1ecb50e6bced11932
|
||||
size 1185335
|
||||
@ -1,92 +0,0 @@
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
--- ColPack-1.0.9/Utilities/extra.cpp 2012-02-04 04:00:14.000000000 +0100
|
||||
+++ ColPack-1.0.9/Utilities/extra.cpp 2016-05-25 11:47:41.593922991 +0200
|
||||
@@ -49,7 +49,7 @@
|
||||
|
||||
ofstream out_Matrix (s_MatrixName.c_str());
|
||||
if(!out_Matrix) {
|
||||
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
|
||||
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
string s_MatrixName = "pattern"+s_postfix+s_BaseName;
|
||||
ofstream out_Matrix (s_MatrixName.c_str());
|
||||
if(!out_Matrix) {
|
||||
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
|
||||
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
|
||||
ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
|
||||
if(!out_CompressedMatrix) {
|
||||
- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
|
||||
+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
|
||||
ofstream out_Matrix (s_MatrixName.c_str());
|
||||
if(!out_Matrix) {
|
||||
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
|
||||
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@
|
||||
string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
|
||||
ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
|
||||
if(!out_CompressedMatrix) {
|
||||
- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
|
||||
+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue