made Mathematica output from examples more robust against errors

somebody · somebody · commit d21dd1ec9934 · 2023-05-09T15:32:16.000-07:00
diff --git a/src/com/github/mjwach/steiner_tree_algorithms/examples/PlanarTreeExample.java b/src/com/github/mjwach/steiner_tree_algorithms/examples/PlanarTreeExample.java
@@ -22,15 +22,15 @@ public static void main(String[] arguments)
 		
 		CalculatedSteinerTree graphs = DCELGraph.makeSteinerTreeAndDelaunayTriangulation(points, SteinerDuplicatePointPolicy.includeOnlyOneVertexPerLocation);
 		
-		if (Printing.produceMathematicaCode) System.out.println("{");
+		if (Printing.produceMathematicaCode) System.out.print("{");
 		
-		Printing.performOn(graphs.steinerTree, "Steiner tree", "Red");
+		Printing.performOn(graphs.steinerTree, "Steiner tree", "Magenta");
 		if (!Printing.produceMathematicaCode) System.out.println();
 
 		if (Printing.produceMathematicaCode) System.out.println(", ");
 		
 		Printing.performOn(graphs.delaunayTriangulation, "Delaunay triangulation", "Green");
 
-		if (Printing.produceMathematicaCode) System.out.println("}\n(* Paste the entire output of this program into Mathematica to see the graphs! *)");
+		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs!  Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");
 	}
 }
diff --git a/src/com/github/mjwach/steiner_tree_algorithms/examples/Subgraph2DExample.java b/src/com/github/mjwach/steiner_tree_algorithms/examples/Subgraph2DExample.java
@@ -56,7 +56,8 @@ public static void main(String[] args)
 		
 		graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);
 		
-		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Red");
-		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! *)");
+		if (Printing.produceMathematicaCode) System.out.print("{");
+		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Magenta");
+		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph!  Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");
 	}
 }
diff --git a/src/com/github/mjwach/steiner_tree_algorithms/examples/Subgraph3DExample.java b/src/com/github/mjwach/steiner_tree_algorithms/examples/Subgraph3DExample.java
@@ -92,7 +92,8 @@ public void addDiagonalEdge(int x, int y, int z, int random0123)
 		
 		graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);
 		
-		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Red");
-		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! *)");
+		if (Printing.produceMathematicaCode) System.out.print("{");
+		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Magenta");
+		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph!  Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");
 	}
 }
diff --git a/src/com/github/mjwach/steiner_tree_algorithms/examples/SubgraphArbitraryWeightsExample.java b/src/com/github/mjwach/steiner_tree_algorithms/examples/SubgraphArbitraryWeightsExample.java
@@ -66,7 +66,7 @@ public static void main(String[] args)
 	{
 		Printing.produceMathematicaCode = false;  // change this to true if you want
 		
-		if (Printing.produceMathematicaCode) System.out.println("{");
+		if (Printing.produceMathematicaCode) System.out.print("{");
 	
 		printGraph("Steiner tree (where the main graph is a grid with trivial edge weights)", new WeightFunction()
 		{
@@ -116,8 +116,7 @@ public float actOn(PlaneVector v, int gridLength)
 			}
 		});
 
-		if (Printing.produceMathematicaCode) System.out.println("}");
-		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! *)");
+		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs!  Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");
 	}
 
 	private static void printGraph(String graphName, WeightFunction weightFunction)
@@ -186,6 +185,6 @@ public int getIndex(int x, int y)
 		
 		graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);
 		
-		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, graphName, "Red");
+		Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, graphName, "Magenta");
 	}
 }
diff --git a/src/com/github/mjwach/steiner_tree_algorithms/examples/SubgraphManhattanDistanceExample.java b/src/com/github/mjwach/steiner_tree_algorithms/examples/SubgraphManhattanDistanceExample.java
@@ -48,13 +48,13 @@ public static void main(String[] args)
 	{
 		Printing.produceMathematicaCode = false;  // change this to true if you want
 		
-		if (Printing.produceMathematicaCode) System.out.println("{");
+		if (Printing.produceMathematicaCode) System.out.print("{");
 		
 		printGraph("Graph", true, "Green", EdgeArraysGraph.defaultEdgeFactory);
 		System.out.println(Printing.produceMathematicaCode ? "," : "");
-		printGraph("Steiner tree of graph (Euclidean metric)", false, "Magenta", EdgeArraysGraph.defaultEdgeFactory);
+		printGraph("Steiner tree of graph (Euclidean metric)", false, "Blue", EdgeArraysGraph.defaultEdgeFactory);
 		System.out.println(Printing.produceMathematicaCode ? "," : "");
-		printGraph("Steiner tree of graph (Manhattan metric)", false, "Red", new EdgeFactory()
+		printGraph("Steiner tree of graph (Manhattan metric)", false, "Magenta", new EdgeFactory()
 		{			
 			@Override
 			public Edge act(Vertex end0, Vertex end1)
@@ -63,8 +63,7 @@ public Edge act(Vertex end0, Vertex end1)
 			}
 		});
 
-		if (Printing.produceMathematicaCode) System.out.println("}");
-		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! *)");
+		if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs!  Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");
 	}
 
 	private static void printGraph(String graphName, boolean drawGraphNotSteinerTree, String color, EdgeFactory edgeFactory)

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ public static void main(String[] arguments)`
`22`	`22`
`23`	`23`	`CalculatedSteinerTree graphs = DCELGraph.makeSteinerTreeAndDelaunayTriangulation(points, SteinerDuplicatePointPolicy.includeOnlyOneVertexPerLocation);`
`24`	`24`
`25`		`- if (Printing.produceMathematicaCode) System.out.println("{");`
	`25`	`+ if (Printing.produceMathematicaCode) System.out.print("{");`
`26`	`26`
`27`		`- Printing.performOn(graphs.steinerTree, "Steiner tree", "Red");`
	`27`	`+ Printing.performOn(graphs.steinerTree, "Steiner tree", "Magenta");`
`28`	`28`	`if (!Printing.produceMathematicaCode) System.out.println();`
`29`	`29`
`30`	`30`	`if (Printing.produceMathematicaCode) System.out.println(", ");`
`31`	`31`
`32`	`32`	`Printing.performOn(graphs.delaunayTriangulation, "Delaunay triangulation", "Green");`
`33`	`33`
`34`		`- if (Printing.produceMathematicaCode) System.out.println("}\n(* Paste the entire output of this program into Mathematica to see the graphs! *)");`
	`34`	`+ if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public static void main(String[] args)`
`56`	`56`
`57`	`57`	`graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);`
`58`	`58`
`59`		`- Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Red");`
`60`		`- if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! *)");`
	`59`	`+ if (Printing.produceMathematicaCode) System.out.print("{");`
	`60`	`+ Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Magenta");`
	`61`	`+ if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ public void addDiagonalEdge(int x, int y, int z, int random0123)`
`92`	`92`
`93`	`93`	`graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);`
`94`	`94`
`95`		`- Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Red");`
`96`		`- if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! *)");`
	`95`	`+ if (Printing.produceMathematicaCode) System.out.print("{");`
	`96`	`+ Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, "Steiner tree", "Magenta");`
	`97`	`+ if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graph! Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");`
`97`	`98`	`}`
`98`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static void main(String[] args)`
`66`	`66`	`{`
`67`	`67`	`Printing.produceMathematicaCode = false; // change this to true if you want`
`68`	`68`
`69`		`- if (Printing.produceMathematicaCode) System.out.println("{");`
	`69`	`+ if (Printing.produceMathematicaCode) System.out.print("{");`
`70`	`70`
`71`	`71`	`printGraph("Steiner tree (where the main graph is a grid with trivial edge weights)", new WeightFunction()`
`72`	`72`	`{`
`@@ -116,8 +116,7 @@ public float actOn(PlaneVector v, int gridLength)`
`116`	`116`	`}`
`117`	`117`	`});`
`118`	`118`
`119`		`- if (Printing.produceMathematicaCode) System.out.println("}");`
`120`		`- if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! *)");`
	`119`	`+ if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`private static void printGraph(String graphName, WeightFunction weightFunction)`
`@@ -186,6 +185,6 @@ public int getIndex(int x, int y)`
`186`	`185`
`187`	`186`	`graph.markSteinerSubgraph(terminals, steinerMarkIndex, NullInterruptionSignal.instance, options);`
`188`	`187`
`189`		`- Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, graphName, "Red");`
	`188`	`+ Printing.performOn(graph, steinerMarkIndex, steinerMarkIndex + 1, graphName, "Magenta");`
`190`	`189`	`}`
`191`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,13 @@ public static void main(String[] args)`
`48`	`48`	`{`
`49`	`49`	`Printing.produceMathematicaCode = false; // change this to true if you want`
`50`	`50`
`51`		`- if (Printing.produceMathematicaCode) System.out.println("{");`
	`51`	`+ if (Printing.produceMathematicaCode) System.out.print("{");`
`52`	`52`
`53`	`53`	`printGraph("Graph", true, "Green", EdgeArraysGraph.defaultEdgeFactory);`
`54`	`54`	`System.out.println(Printing.produceMathematicaCode ? "," : "");`
`55`		`- printGraph("Steiner tree of graph (Euclidean metric)", false, "Magenta", EdgeArraysGraph.defaultEdgeFactory);`
	`55`	`+ printGraph("Steiner tree of graph (Euclidean metric)", false, "Blue", EdgeArraysGraph.defaultEdgeFactory);`
`56`	`56`	`System.out.println(Printing.produceMathematicaCode ? "," : "");`
`57`		`- printGraph("Steiner tree of graph (Manhattan metric)", false, "Red", new EdgeFactory()`
	`57`	`+ printGraph("Steiner tree of graph (Manhattan metric)", false, "Magenta", new EdgeFactory()`
`58`	`58`	`{`
`59`	`59`	`@Override`
`60`	`60`	`public Edge act(Vertex end0, Vertex end1)`
`@@ -63,8 +63,7 @@ public Edge act(Vertex end0, Vertex end1)`
`63`	`63`	`}`
`64`	`64`	`});`
`65`	`65`
`66`		`- if (Printing.produceMathematicaCode) System.out.println("}");`
`67`		`- if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! *)");`
	`66`	`+ if (Printing.produceMathematicaCode) System.out.println("(* Paste the entire output of this program into Mathematica to see the graphs! Note that copying from the Eclipse console can add weird formatting - paste into a plain text editor first to strip that away! *)}");`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`private static void printGraph(String graphName, boolean drawGraphNotSteinerTree, String color, EdgeFactory edgeFactory)`