[xiph-commits] r10071 - trunk/planarity

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2005-09-26 01:10:34 -0700 (Mon, 26 Sep 2005)
New Revision: 10071

Modified:
   trunk/planarity/graph_generate.c
   trunk/planarity/graph_generate.h
   trunk/planarity/graph_generate_mesh1.c
   trunk/planarity/version.h
Log:
Another puzzle level.



Modified: trunk/planarity/graph_generate.c
===================================================================
--- trunk/planarity/graph_generate.c	2005-09-26 07:28:47 UTC (rev 10070)
+++ trunk/planarity/graph_generate.c	2005-09-26 08:10:34 UTC (rev 10071)
@@ -40,7 +40,7 @@
   int unlock;
 } gen_instance;
 
-#define FINITE_LEVELS 7
+#define FINITE_LEVELS 8
 static gen_instance i_list[FINITE_LEVELS]={ 
   {"mesh1", 1, "A Small Beginning",           generate_mesh_1,  1.,1., 1 }, // 1
   {"mesh1", 2, "My First Real Level(tm)",     generate_mesh_1,  1.,1., 2 }, // 2
@@ -48,12 +48,13 @@
   {"mesh1", 3, "Larger, Not Harder",          generate_mesh_1,  1.,1., 3 }, // 4
   {"meshC", 5, "The Trick Is It's Easy",      generate_mesh_1C, 1.,1., 2 }, // 5
   {"meshM", 6, "If You Squint, It's A Brick", generate_mesh_1M, 1.,1., 1 }, // 6
-  {"mesh1", 7, "Round But Straightforward",   generate_mesh_1,  1.,1., 3 }, // 7
+  {"mesh1", 7, "Round But Straightforward",   generate_mesh_1,  1.,1., 4 }, // 7
+  {"meshS",10, "Tough and Stringy",           generate_mesh_1S, 2.,1., 3 }, // 8
 };
 
 #define LOOP_LEVELS 1
 static gen_instance i_list_loop[LOOP_LEVELS]={ 
-  {"mesh1", 8, "\"Original\" Board Number %d",    generate_mesh_1, 1.,1., 2 }, // n
+  {"mesh1", 9, "\"Original\" Board Number %d",    generate_mesh_1, 1.,1., 2 }, // n
 };
 
 int generate_find_number(char *id){

Modified: trunk/planarity/graph_generate.h
===================================================================
--- trunk/planarity/graph_generate.h	2005-09-26 07:28:47 UTC (rev 10070)
+++ trunk/planarity/graph_generate.h	2005-09-26 08:10:34 UTC (rev 10071)
@@ -31,5 +31,6 @@
 extern void generate_mesh_1(graph *g, int order);
 extern void generate_mesh_1M(graph *g, int order);
 extern void generate_mesh_1C(graph *g, int order);
+extern void generate_mesh_1S(graph *g, int order);
 
 extern void generate_data(graph *g, int order);

Modified: trunk/planarity/graph_generate_mesh1.c
===================================================================
--- trunk/planarity/graph_generate_mesh1.c	2005-09-26 07:28:47 UTC (rev 10070)
+++ trunk/planarity/graph_generate_mesh1.c	2005-09-26 08:10:34 UTC (rev 10071)
@@ -274,3 +274,10 @@
   n=m.width*m.height;
   arrange_verticies_circle(g,M_PI/n - M_PI/2,M_PI/n - M_PI/2);
 }
+
+void generate_mesh_1S(graph *g, int order){
+  mesh m;
+  generate_mesh(g,&m,order,2);
+  randomize_verticies(g);
+  arrange_verticies_circle(g,0,0);
+}

Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h	2005-09-26 07:28:47 UTC (rev 10070)
+++ trunk/planarity/version.h	2005-09-26 08:10:34 UTC (rev 10071)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Mon Sep 26 03:26:45 EDT 2005] */
+/* DO NOT EDIT: Automated versioning hack [Mon Sep 26 04:02:41 EDT 2005] */