Update graph coloring algorithm [gcolor.syncgcolor] and examples for …

…it. Created examples of graphs
annoviko · Mar 18, 2014 · 39a708d · 39a708d
1 parent 6bee700
commit 39a708d
Show file tree

Hide file tree

Showing 13 changed files with 106 additions and 96 deletions.
diff --git a/gcolor/syncgcolor/examples.py b/gcolor/syncgcolor/examples.py
@@ -1,11 +1,19 @@
 from gcolor.syncgcolor import syncgcolor;
-from nnet.sync import net, conn_type, solve_type, draw_dynamics;
 
-def template_graph_coloring(strength, graph_matrix_repr, title = "Sample"):
+from nnet.sync import draw_dynamics, solve_type;
+
+from support import read_sample;
+
+from samples.definitions import GRAPH_SIMPLE_SAMPLES;
+
+
+def template_graph_coloring(positive_weight, negative_weight, filename, reduction = None, title = "Sample"):
     print("\nGraph Coloring: ", title);
-    network = syncgcolor(graph_matrix_repr, strength);
 
-    (t, dyn) = network.process(collect_dynamic = True);
+    graph_matrix_repr = read_sample(filename);
+    network = syncgcolor(graph_matrix_repr, positive_weight, negative_weight, reduction);
+
+    (t, dyn) = network.process(order = 0.999, solution = solve_type.FAST, collect_dynamic = True);
     draw_dynamics(t, dyn);
 
     clusters = network.get_clusters();
@@ -15,117 +23,43 @@ def template_graph_coloring(strength, graph_matrix_repr, title = "Sample"):
 
 
 def one_circle1():
-    graph_matrix_repr = [ [0, 1, 0, 0, 1],
-                          [1, 0, 1, 0, 0],
-                          [0, 1, 0, 1, 0],
-                          [0, 0, 1, 0, 1],
-                          [1, 0, 0, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Circle 1");    
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_ONE_CIRCLE1, None, "Circle 1");    
 
 
 def one_circle2():
-    graph_matrix_repr = [ [0, 1, 0, 0, 0, 1],
-                          [1, 0, 1, 0, 0, 0],
-                          [0, 1, 0, 1, 0, 0],
-                          [0, 0, 1, 0, 1, 0],
-                          [0, 0, 0, 1, 0, 1],
-                          [1, 0, 0, 0, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Circle 2");   
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_ONE_CIRCLE2, None, "Circle 2");   
 
 
 def one_circle3():
-    graph_matrix_repr = [ [0, 1, 0, 0, 0, 0, 1],
-                          [1, 0, 1, 0, 0, 0, 0],
-                          [0, 1, 0, 1, 0, 0, 0],
-                          [0, 0, 1, 0, 1, 0, 0],
-                          [0, 0, 0, 1, 0, 1, 0],
-                          [0, 0, 0, 0, 1, 0, 1],
-                          [1, 0, 0, 0, 0, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Circle 3");   
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_ONE_CIRCLE3, None, "Circle 3");   
 
 
 def broken_circle1():
-    graph_matrix_repr = [ [0, 1, 0, 0, 0, 1],
-                          [1, 0, 1, 0, 0, 0],
-                          [0, 1, 0, 1, 0, 1],
-                          [0, 0, 1, 0, 1, 0],
-                          [0, 0, 0, 1, 0, 1],
-                          [1, 0, 1, 0, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Broken Circle 1");   
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_BROKEN_CIRCLE1, None, "Broken Circle 1");   
 
 
 def broken_circle2():
-    graph_matrix_repr = [ [0, 1, 0, 0, 1],
-                          [1, 0, 1, 0, 0],
-                          [0, 1, 0, 1, 1],
-                          [0, 0, 1, 0, 1],
-                          [1, 0, 1, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Broken Circle 2");  
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_BROKEN_CIRCLE2, None, "Broken Circle 2");  
 
 
-def one_star():
-    graph_matrix_repr = [ [0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 1],
-                          [1, 1, 1, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "One Star");
+def one_crossroad():
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_ONE_CROSSROAD, None, "One Crossroad");
 
 
 def five_pointed_star():
-    graph_matrix_repr = [ [0, 0, 1, 1, 0],
-                          [0, 0, 0, 1, 1],
-                          [1, 0, 0, 0, 1],
-                          [1, 1, 0, 0, 0],
-                          [0, 1, 1, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "Five Pointed Star");   
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_FIVE_POINTED_STAR, None, "Five Pointed Star");   
 
 
 def one_line():
-    graph_matrix_repr = [ [0, 1, 0, 0, 0],
-                          [1, 0, 1, 0, 0],
-                          [0, 1, 0, 1, 0],
-                          [0, 0, 1, 0, 1],
-                          [0, 0, 0, 1, 0] ];
-
-    template_graph_coloring(1, graph_matrix_repr, "One Line");      
-
-
-def two_interconnected_stars():
-    graph_matrix_repr = [ [0, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                          [0, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                          [0, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                          [0, 0, 0, 0, 1, 0, 0, 0, 0, 0],
-                          [1, 1, 1, 1, 0, 0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 0, 0, 0, 0, 0, 1],
-                          [0, 0, 0, 0, 1, 1, 1, 1, 1, 0] ];
-
-    template_graph_coloring(2, graph_matrix_repr, "Two Interconnected Stars");
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_ONE_LINE, None, "One Line");      
+
+
+def two_crossroads():
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_TWO_CROSSROADS, None, "Two Interconnected Stars");
 
 
 def five_pointed_frame_star():
-    graph_matrix_repr = [ [0, 1, 0, 0, 1, 1, 0, 0, 0, 0],
-                          [1, 0, 1, 0, 0, 0, 1, 0, 0, 0],
-                          [0, 1, 0, 1, 0, 0, 0, 1, 0, 0],
-                          [0, 0, 1, 0, 1, 0, 0, 0, 1, 0],
-                          [1, 0, 0, 1, 0, 0, 0, 0, 0, 1],
-                          [1, 0, 0, 0, 0, 0, 0, 1, 1, 0],
-                          [0, 1, 0, 0, 0, 0, 0, 0, 1, 1],
-                          [0, 0, 1, 0, 0, 1, 0, 0, 0, 1],
-                          [0, 0, 0, 1, 0, 1, 1, 0, 0, 0],
-                          [0, 0, 0, 0, 1, 0, 1, 1, 0, 0] ];
-
-    template_graph_coloring(2, graph_matrix_repr, "Five Pointed Star With Frame");    
+    template_graph_coloring(0, -1, GRAPH_SIMPLE_SAMPLES.GRAPH_FIVE_POINTED_FRAME_STAR, None, "Five Pointed Star With Frame");    
 
 
 one_line();
@@ -134,7 +68,7 @@ def five_pointed_frame_star():
 one_circle3();
 broken_circle1();
 broken_circle2();
-one_star();
+one_crossroad();
+two_crossroads();
 five_pointed_star();
-five_pointed_frame_star();
-two_interconnected_stars();
+five_pointed_frame_star();
diff --git a/nnet/sync/__init__.py b/nnet/sync/__init__.py
@@ -77,7 +77,7 @@ def cluster(self, value):
         self._cluster = value;
 
 
-    def __init__(self, num_osc, weight, frequency = False, type_conn = conn_type.ALL_TO_ALL, conn_represent = conn_represent.MATRIX, initial_phases = initial_type.RANDOM_GAUSSIAN):
+    def __init__(self, num_osc, weight = 1, frequency = False, type_conn = conn_type.ALL_TO_ALL, conn_represent = conn_represent.MATRIX, initial_phases = initial_type.RANDOM_GAUSSIAN):
         self._num_osc = num_osc;
         self._weight = weight;
 

diff --git a/samples/definitions.py b/samples/definitions.py
@@ -19,3 +19,15 @@ class FCPS_SAMPLES:
     SAMPLE_TETRA            = samples.__path__[0] + "\\SampleTetra.txt";
     SAMPLE_TWO_DIAMONDS     = samples.__path__[0] + "\\SampleTwoDiamonds.txt";
     SAMPLE_WING_NUT         = samples.__path__[0] + "\\SampleWingNut.txt";
+
+class GRAPH_SIMPLE_SAMPLES:
+    GRAPH_BROKEN_CIRCLE1            = samples.__path__[0] + "\\graphs\\GraphBrokenCircle1.txt";
+    GRAPH_BROKEN_CIRCLE2            = samples.__path__[0] + "\\graphs\\GraphBrokenCircle2.txt";
+    GRAPH_FIVE_POINTED_FRAME_STAR   = samples.__path__[0] + "\\graphs\\GraphFivePointedFrameStar.txt";
+    GRAPH_FIVE_POINTED_STAR         = samples.__path__[0] + "\\graphs\\GraphFivePointedStar.txt";
+    GRAPH_ONE_CIRCLE1               = samples.__path__[0] + "\\graphs\\GraphOneCircle1.txt";
+    GRAPH_ONE_CIRCLE2               = samples.__path__[0] + "\\graphs\\GraphOneCircle2.txt";
+    GRAPH_ONE_CIRCLE3               = samples.__path__[0] + "\\graphs\\GraphOneCircle3.txt";
+    GRAPH_ONE_CROSSROAD             = samples.__path__[0] + "\\graphs\\GraphOneCrossroad.txt";
+    GRAPH_ONE_LINE                  = samples.__path__[0] + "\\graphs\\GraphOneLine.txt";
+    GRAPH_TWO_CROSSROADS            = samples.__path__[0] + "\\graphs\\GraphTwoCrossroads.txt";
diff --git a/samples/graphs/GraphBrokenCircle1.txt b/samples/graphs/GraphBrokenCircle1.txt
@@ -0,0 +1,6 @@
+0 1 0 0 0 1
+1 0 1 0 0 0
+0 1 0 1 0 1
+0 0 1 0 1 0
+0 0 0 1 0 1
+1 0 1 0 1 0
diff --git a/samples/graphs/GraphBrokenCircle2.txt b/samples/graphs/GraphBrokenCircle2.txt
@@ -0,0 +1,5 @@
+0 1 0 0 1
+1 0 1 0 0
+0 1 0 1 1
+0 0 1 0 1
+1 0 1 1 0
diff --git a/samples/graphs/GraphFivePointedFrameStar.txt b/samples/graphs/GraphFivePointedFrameStar.txt
@@ -0,0 +1,10 @@
+0 1 0 0 1 1 0 0 0 0
+1 0 1 0 0 0 1 0 0 0
+0 1 0 1 0 0 0 1 0 0
+0 0 1 0 1 0 0 0 1 0
+1 0 0 1 0 0 0 0 0 1
+1 0 0 0 0 0 0 1 1 0
+0 1 0 0 0 0 0 0 1 1
+0 0 1 0 0 1 0 0 0 1
+0 0 0 1 0 1 1 0 0 0
+0 0 0 0 1 0 1 1 0 0
diff --git a/samples/graphs/GraphFivePointedStar.txt b/samples/graphs/GraphFivePointedStar.txt
@@ -0,0 +1,5 @@
+0 0 1 1 0
+0 0 0 1 1
+1 0 0 0 1
+1 1 0 0 0
+0 1 1 1 0
diff --git a/samples/graphs/GraphOneCircle1.txt b/samples/graphs/GraphOneCircle1.txt
@@ -0,0 +1,5 @@
+0 1 0 0 1
+1 0 1 0 0
+0 1 0 1 0
+0 0 1 0 1
+1 0 0 1 0
diff --git a/samples/graphs/GraphOneCircle2.txt b/samples/graphs/GraphOneCircle2.txt
@@ -0,0 +1,6 @@
+0 1 0 0 0 1
+1 0 1 0 0 0
+0 1 0 1 0 0
+0 0 1 0 1 0
+0 0 0 1 0 1
+1 0 0 0 1 0
diff --git a/samples/graphs/GraphOneCircle3.txt b/samples/graphs/GraphOneCircle3.txt
@@ -0,0 +1,7 @@
+0 1 0 0 0 0 1
+1 0 1 0 0 0 0
+0 1 0 1 0 0 0
+0 0 1 0 1 0 0
+0 0 0 1 0 1 0
+0 0 0 0 1 0 1
+1 0 0 0 0 1 0
diff --git a/samples/graphs/GraphOneCrossroad.txt b/samples/graphs/GraphOneCrossroad.txt
@@ -0,0 +1,5 @@
+0 0 0 0 1
+0 0 0 0 1
+0 0 0 0 1
+0 0 0 0 1
+1 1 1 1 0
diff --git a/samples/graphs/GraphOneLine.txt b/samples/graphs/GraphOneLine.txt
@@ -0,0 +1,5 @@
+0 1 0 0 0
+1 0 1 0 0
+0 1 0 1 0
+0 0 1 0 1
+0 0 0 1 0
diff --git a/samples/graphs/GraphTwoCrossroads.txt b/samples/graphs/GraphTwoCrossroads.txt
@@ -0,0 +1,10 @@
+0 0 0 0 1 0 0 0 0 0
+0 0 0 0 1 0 0 0 0 0
+0 0 0 0 1 0 0 0 0 0
+0 0 0 0 1 0 0 0 0 0
+1 1 1 1 0 0 0 0 0 1
+0 0 0 0 0 0 0 0 0 1
+0 0 0 0 0 0 0 0 0 1
+0 0 0 0 0 0 0 0 0 1
+0 0 0 0 0 0 0 0 0 1
+0 0 0 0 1 1 1 1 1 0