MuPAD-Combinat

Revision: 7325
          http://mupad-combinat.svn.sourceforge.net/mupad-combinat/?rev=7325&view=rev
Author:   nthiery
Date:     2007-12-19 13:27:07 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
New (edge) options: Directed, Ignore, Label + improved edge option parsing.

Modified Paths:
--------------
    trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu

Modified: trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu
===================================================================
--- trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2007-12-18 08:40:01 UTC (rev 7324)
+++ trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2007-12-19 21:27:07 UTC (rev 7325)
@@ -1,6 +1,6 @@
 Graph::dotTeX :=
 proc(G: Graph) : DOM_STRING
-    local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, edgeOptions;
+    local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, edgeOptions, arrow, knownEdges;
 begin
     options := prog::getOptions(table(EdgeColors = table(),
 				      Direction  = Down,
@@ -40,6 +40,7 @@
     // For Windows
 	s := stringlib::subs(s, "\r"="");
     end_proc:
+    knownEdges := {};
     for vertex in dom::getVertices(G) do
 	result := _concat(result,
 		       "N_", vertexRanker(vertex),
@@ -49,39 +50,61 @@
 	for child in dom::getAdjacentEdgesLeaving(G, [vertex]) do
 	    if not options[Loops] and vertex=child then next; end_if;
 	    edge := [vertex, child];
-	    edgeOptions := {op(options[EdgeOptions](edge, weights[edge]))};
+	    edgeOptions := table(Label = if contains(weights,edge) then weights[edge] else NIL end_if,
+				 Backward = FALSE,
+				 Constraints = TRUE,
+				 Splines = Splines,
+				 Ignore = FALSE,
+				 Directed = G::isDirected(),
+				 if type(opt) = "_equal" then
+				     opt
+				 else
+				     opt = TRUE
+				 end_if
+				 $ opt in options[EdgeOptions](edge, weights[edge]));
+	    if edgeOptions[Ignore] then next; end_if;
+	    if edgeOptions[Directed] then
+		arrow := " -> ";
+	    else
+		arrow := " -- "
+	    end_if;
 	    result:= _concat(result,
-			     if contains(edgeOptions, Backward) then
-				 "N_".vertexRanker(child), " -> ",
+			     if edgeOptions[Backward] then
+				 "N_".vertexRanker(child), arrow,
 				 "N_".vertexRanker(vertex)
 			     else
-				 "N_".vertexRanker(vertex), " -> ",
+				 "N_".vertexRanker(vertex), arrow,
 				 "N_".vertexRanker(child)
 			     end_if,
 			     " [ ",
+			     if not edgeOptions[Directed] then
+				 " arrowhead=none "
+			     else
+				 ""
+			     end_if,
 			     if contains(options[EdgeColors], edge) then
 				 "color = \"", options[EdgeColors][edge], "\" "
 			     else
 				 ""
 			     end_if,
-			     if contains(edgeOptions, Constraints = FALSE) then
+			     if edgeOptions[Constraints] then
+				 ""
+			     else
 				 " constraint = false, "
-			     else
-				 ""
 			     end_if,
-			     if contains(edgeOptions, Backward) then
+			     if edgeOptions[Backward] then
 				 " dir = back, ";
 			     else
 				 ""
 			     end_if,
-			     if contains(edgeOptions, Splines = Line) then
+			     if edgeOptions[Splines] = Line then
 				 " splines = false, ";
 			     else
 				 ""
 			     end_if,
-			     if contains(weights, edge) then
+			     if edgeOptions[Label] <> NIL then
 				 "label = \" \", texlbl = \"$",
-				 fixquoting(generate::TeX(weights[edge])),
+				 fixquoting(generate::TeX(edgeOptions[Label])),
 				 "$\""
 			     else
 				 ""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7346
          http://mupad-combinat.svn.sourceforge.net/mupad-combinat/?rev=7346&view=rev
Author:   nthiery
Date:     2007-12-21 12:15:36 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
New options Directed and Dot2TeXOptions
Added comment.

Modified Paths:
--------------
    trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu

Modified: trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu
===================================================================
--- trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2007-12-21 20:14:45 UTC (rev 7345)
+++ trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2007-12-21 20:15:36 UTC (rev 7346)
@@ -1,3 +1,5 @@
+// Backward: draw the same edge, but layout it going up instead of down
+
 Graph::dotTeX :=
 proc(G: Graph) : DOM_STRING
     local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, edgeOptions, arrow, knownEdges;
@@ -4,13 +6,17 @@
 begin
     options := prog::getOptions(table(EdgeColors = table(),
 				      Direction  = Down,
+				      Directed   = G::isDirected(),
 				      EdgeOptions = (()->{}),
-				      Loops      = TRUE
+				      Loops      = TRUE,
+				      Dot2TeXOptions = ""
 				     ),
 				table(EdgeColors = Type::TableOf(Graph::getEdges(G), DOM_STRING),
 				      Direction  = [Left, Right, Up, Down],
+				      Directed   = DOM_BOOL,
 				      EdgeOptions  = Type::Function,
-				      Loops      = DOM_BOOL
+				      Loops      = DOM_BOOL,
+				      Dot2TeXOptions = DOM_STRING
 				     ),
 				[args(2..args(0))], Error);
     weights := G::getEdgeDescriptions();
@@ -24,6 +30,7 @@
 
     rankdir := table(Left = "RL", Right = "LR", Up = "BT");
     result := "digraph  G {\n";
+    result := result."  d2toptions =\"".options[Dot2TeXOptions]."\";\n";
     result := result."node [ shape=plaintext, fontname=\"fixed\" ];\n";
     if contains(rankdir, options[Direction]) then
 	result := result."rankdir=".rankdir[options[Direction]]."\n";
@@ -55,7 +62,7 @@
 				 Constraints = TRUE,
 				 Splines = Splines,
 				 Ignore = FALSE,
-				 Directed = G::isDirected(),
+				 Directed = options[Directed],
 				 if type(opt) = "_equal" then
 				     opt
 				 else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7381
          http://mupad-combinat.svn.sourceforge.net/mupad-combinat/?rev=7381&view=rev
Author:   nthiery
Date:     2008-01-17 16:21:33 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
New options: VertexOptions, RankSep, NodeSep
New vertex option: Color
New edge option: LabelStyle
Misc fixes

Modified Paths:
--------------
    trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu

Modified: trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu
===================================================================
--- trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2008-01-16 15:36:14 UTC (rev 7380)
+++ trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2008-01-18 00:21:33 UTC (rev 7381)
@@ -2,18 +2,23 @@
 
 Graph::dotTeX :=
 proc(G: Graph) : DOM_STRING
-    local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, edgeOptions, arrow, knownEdges;
+    local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, vertexOptions, edgeOptions, arrow, knownEdges;
 begin
-    options := prog::getOptions(table(EdgeColors = table(),
+    options := prog::getOptions([     EdgeColors = table(),
 				      Direction  = Down,
 				      Directed   = G::isDirected(),
 				      EdgeOptions = (()->{}),
+				      VertexOptions = (()->{}),
 				      Loops      = TRUE,
-				      Dot2TeXOptions = ""
-				     ),
+				      Dot2TeXOptions = "",
+				      RankSep, NodeSep
+				],
 				table(EdgeColors = Type::TableOf(Graph::getEdges(G), DOM_STRING),
 				      Direction  = [Left, Right, Up, Down],
+				      RankSep  = Dom::Float,
+				      NodeSep  = Dom::Float,
 				      Directed   = DOM_BOOL,
+				      VertexOptions  = Type::Function,
 				      EdgeOptions  = Type::Function,
 				      Loops      = DOM_BOOL,
 				      Dot2TeXOptions = DOM_STRING
@@ -35,6 +40,12 @@
     if contains(rankdir, options[Direction]) then
 	result := result."rankdir=".rankdir[options[Direction]]."\n";
     end_if;
+    if contains(options, RankSep) then
+	result := result."ranksep=".options[RankSep]."\n";
+    end_if;
+    if contains(options, NodeSep) then
+	result := result."nodesep=".options[NodeSep]."\n";
+    end_if;
     fixquoting :=
     proc(s)
     begin
@@ -49,11 +60,18 @@
     end_proc:
     knownEdges := {};
     for vertex in dom::getVertices(G) do
+	vertexOptions := table(op(options[VertexOptions](vertex)));
 	result := _concat(result,
-		       "N_", vertexRanker(vertex),
-		       " [ label = \" \", texlbl = \"$",
+			  "N_", vertexRanker(vertex),
+			  " [ label = \" \", texlbl = \"$",
 			  fixquoting(generate::TeX(vertex)),
-		       "$\" ];\n");
+			  "$\",",
+			  if contains(vertexOptions, Color) then
+			      "lblstyle = ".vertexOptions[Color].", "
+			  else
+			      ()
+			  end_if,
+			  "];\n");
 	for child in dom::getAdjacentEdgesLeaving(G, [vertex]) do
 	    if not options[Loops] and vertex=child then next; end_if;
 	    edge := [vertex, child];
@@ -85,12 +103,12 @@
 			     end_if,
 			     " [ ",
 			     if not edgeOptions[Directed] then
-				 " arrowhead=none "
+				 " arrowhead=none, "
 			     else
 				 ""
 			     end_if,
 			     if contains(options[EdgeColors], edge) then
-				 "color = \"", options[EdgeColors][edge], "\" "
+				 "color = \"", options[EdgeColors][edge], "\", "
 			     else
 				 ""
 			     end_if,
@@ -109,10 +127,15 @@
 			     else
 				 ""
 			     end_if,
+			     if contains(edgeOptions, LabelStyle) then
+				 "lblstyle=\"".edgeOptions[LabelStyle]."\", "
+			     else
+				 ""
+			     end_if,
 			     if edgeOptions[Label] <> NIL then
 				 "label = \" \", texlbl = \"$",
 				 fixquoting(generate::TeX(edgeOptions[Label])),
-				 "$\""
+				 "$\","
 			     else
 				 ""
 			     end_if,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7527
          http://mupad-combinat.svn.sourceforge.net/mupad-combinat/?rev=7527&view=rev
Author:   nthiery
Date:     2008-05-17 14:55:44 -0700 (Sat, 17 May 2008)

Log Message:
-----------
Type::Function -> Type::Morphism()
Now compatible (via workaround) with call from generate::TeX

Modified Paths:
--------------
    trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu

Modified: trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu
===================================================================
--- trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2008-05-17 21:53:36 UTC (rev 7526)
+++ trunk/MuPAD-Combinat/lib/GRAPH/dotTeX.mu	2008-05-17 21:55:44 UTC (rev 7527)
@@ -1,5 +1,7 @@
 // Backward: draw the same edge, but layout it going up instead of down
 
+Graph::vertexRanker := combinat::rankers::onFly()[1]:
+
 Graph::dotTeX :=
 proc(G: Graph) : DOM_STRING
     local weights, vertexRanker, vertex, child, result, options, edge, fixquoting, rankdir, vertexOptions, edgeOptions, arrow, knownEdges, pair, group;
@@ -20,12 +22,15 @@
 				      NodeSep  = Dom::Float,
 				      Directed   = DOM_BOOL,
 				      Groups   = Type::ListOf(DOM_LIST),
-				      VertexOptions  = Type::Function,
-				      EdgeOptions  = Type::Function,
+				      VertexOptions  = Type::Morphism(),
+				      EdgeOptions  = Type::Morphism(),
 				      Loops      = DOM_BOOL,
 				      Dot2TeXOptions = DOM_STRING
 				     ),
-				[args(2..args(0))], Error);
+				// Workaround: generate::TeX apprently calls
+				// dom::TeX(x, 0) ...
+				select([args(2..args(0))], not _equal, 0),
+				Error);
     weights := G::getEdgeDescriptions();
     if weights = FAIL then
 	weights := G::getEdgeWeights();
@@ -34,6 +39,7 @@
 	weights := table();
     end_if;
     vertexRanker := combinat::rankers::onFly()[1];
+//    vertexRanker := dom::vertexRanker;
 
     rankdir := table(Left = "RL", Right = "LR", Up = "BT");
     result := "digraph  G {\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.