Commit 34663ad7 authored by Kirill Terekhov's avatar Kirill Terekhov

Preparation for K-means algorithm in Partitioner

parent a2aaef9e
...@@ -29,7 +29,8 @@ namespace INMOST ...@@ -29,7 +29,8 @@ namespace INMOST
Zoltan_RIB, ///< Zoltan geometry-based method using Recursive Inertial Bisection. Zoltan_RIB, ///< Zoltan geometry-based method using Recursive Inertial Bisection.
Zoltan_HSFC, ///< Zoltan geometry-based method using Hilbert Space-Filling Curve partitioning. Zoltan_HSFC, ///< Zoltan geometry-based method using Hilbert Space-Filling Curve partitioning.
Parmetis, ///< Parmetis partitioner with the original interface. Parmetis, ///< Parmetis partitioner with the original interface.
Inner_RCM ///< Internal serial only partitioner based on the Reverse Cuthill–McKee algorithm ordering. INNER_RCM, ///< Internal serial only partitioner based on the Reverse Cuthill–McKee algorithm ordering.
INNER_KMEANS ///< Internal parallel paritioner based on K-means clustering.
}; };
enum Action enum Action
{ {
......
...@@ -256,7 +256,7 @@ namespace INMOST ...@@ -256,7 +256,7 @@ namespace INMOST
int package = 0; int package = 0;
switch(pt) switch(pt)
{ {
case Inner_RCM: case INNER_RCM:
package = 0; package = 0;
break; break;
case Zoltan_Parmetis: case Zoltan_Parmetis:
...@@ -270,6 +270,9 @@ namespace INMOST ...@@ -270,6 +270,9 @@ namespace INMOST
case Parmetis: case Parmetis:
package = 2; package = 2;
break; break;
case INNER_KMEANS:
package = 3;
break;
} }
if( package == 0 ) if( package == 0 )
{ {
...@@ -1259,6 +1262,10 @@ namespace INMOST ...@@ -1259,6 +1262,10 @@ namespace INMOST
} }
#endif #endif
}
if( package == 3 ) //KMEANS
{
} }
EXIT_FUNC(); EXIT_FUNC();
} }
...@@ -1270,7 +1277,7 @@ namespace INMOST ...@@ -1270,7 +1277,7 @@ namespace INMOST
int package = 0; int package = 0;
switch(pt) switch(pt)
{ {
case Inner_RCM: case INNER_RCM:
package = 0; package = 0;
break; break;
case Zoltan_Parmetis: case Zoltan_Parmetis:
...@@ -1284,6 +1291,9 @@ namespace INMOST ...@@ -1284,6 +1291,9 @@ namespace INMOST
case Parmetis: case Parmetis:
package = 2; package = 2;
break; break;
case INNER_KMEANS:
package = 3;
break;
} }
if( package == 1 ) if( package == 1 )
{ {
...@@ -1378,7 +1388,7 @@ namespace INMOST ...@@ -1378,7 +1388,7 @@ namespace INMOST
int package = 0; int package = 0;
switch(pt) switch(pt)
{ {
case Inner_RCM: case INNER_RCM:
package = 0; package = 0;
break; break;
case Zoltan_Parmetis: case Zoltan_Parmetis:
...@@ -1392,6 +1402,9 @@ namespace INMOST ...@@ -1392,6 +1402,9 @@ namespace INMOST
case Parmetis: case Parmetis:
package = 2; package = 2;
break; break;
case INNER_KMEANS:
package = 3;
break;
} }
if( package == 1 ) if( package == 1 )
{ {
...@@ -1434,7 +1447,7 @@ namespace INMOST ...@@ -1434,7 +1447,7 @@ namespace INMOST
int package = 0; int package = 0;
switch(pt) switch(pt)
{ {
case Inner_RCM: case INNER_RCM:
package = 0; package = 0;
break; break;
case Zoltan_Parmetis: case Zoltan_Parmetis:
...@@ -1448,6 +1461,9 @@ namespace INMOST ...@@ -1448,6 +1461,9 @@ namespace INMOST
case Parmetis: case Parmetis:
package = 2; package = 2;
break; break;
case INNER_KMEANS:
package = 3;
break;
} }
if( package == 1 ) if( package == 1 )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment