vispan 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00d545c86c8f83e10f5dbf39fadcc384271dca6
-  data.tar.gz: 934f4a88849dfa633e3357c58757e7266edbd6e0
+  metadata.gz: 8409b3a4dac60a1aa4a23df4be7f9fa05712240b
+  data.tar.gz: d595e6663e927fa0dfbbdbe19bd815c9f8ea390f
 SHA512:
-  metadata.gz: 488bca000babaa2f9382f5e051a785c9bf0c4f7e0f639c711ce66b981c46e70d70da3e879001203ac836d05b687ec9febb1c5553425502fce11c39b01313b2de
-  data.tar.gz: 625a53519aa63cb77692d307dbbb5860fa958420c878f6976c1e327210bafea13f4397aeab2dc2482c0eea244fd07f9ac6ed33c625875d0010a9369bc1ac7c8a
+  metadata.gz: b53fbcf60ddf22efe18433ad3aa3af5c00be35750055c324efc523e29eaa1edae25956d1856c31a08e9ee8f86fa47fa7ba05a66fd5c4b8a2db24e4886314de02
+  data.tar.gz: 3d898df89feff8028722e2ec02c1d0d7e98c1e003a29bff1179ccb756df49a849c14d84637c17ffb64afbf05cd0b2a18982a438a958b4aa4db279ab26cf9fbc4

data/lib/vispan/graphwriter.rb

@@ -3,7 +3,6 @@ require "vispan/config.rb"
 class GraphWriter
 
   def build_string(szenarios)
-    # puts "Digraph G{ #{get_general_settings}#{szenarios.map.with_index {|szenario, index| build_szenario(szenario, index)}.join("")}}"
     "Digraph G{ #{get_general_settings}#{szenarios.map.with_index {|szenario, index| build_szenario(szenario, index)}.join("")}}"
   end
 
@@ -16,30 +15,24 @@ class GraphWriter
   end
 
   def write_node(node)
-    # puts node.inspect
     "#{node.name} [label=\"#{node.label}\" #{find_attributes(node)}]\n"
-    # [label=<<TABLE BORDER=\"0\" CELLBORDER=\"0\" CELLSPACING=\"0\" ><TR><TD PORT=\"#{node.name}\">#{node.label}</TD></TR></TABLE>> #{find_attributes(node)}]\n"
-
   end
 
   def write_relations(relation, szenario)
+    output_port = "e"
+    input_port = "w"
+    sorting_order = ""
 
     if relation.get_direction < 0
       previous_node_name = szenario.get_previous_helper_node(relation)
-      "#{relation.start.name}:w-> #{relation.helper.name}:e [dir=\"none\" #{find_attributes(relation)}];
-       #{relation.helper.name}:w -> #{relation.stop.name}:e [dir=\"forward\" #{find_attributes(relation)}];
-       {rank = same; #{previous_node_name}; #{relation.helper.name};}"
-    else
-    #
-    #
-    # return  "#{relation.helper.name} -> #{relation.stop.name} [dir=\"forward\" #{find_attributes(relation)}];
-    #   #{relation.start.name}-> #{relation.helper.name} [dir=\"none\" #{find_attributes(relation)}];
-    #   {rank = same; helper_0Angebotspostenerteilen0; #{relation.helper.name};}"
-    # end
-    # puts "#{relation.start.name} #{relation.start.rank} führt zurück zu #{relation.stop.name} #{relation.stop.rank}" if relation.start.rank > relation.stop.rank
-    "#{relation.start.name}:e-> #{relation.helper.name}:w [dir=\"none\" #{find_attributes(relation)}];
-     #{relation.helper.name}:e -> #{relation.stop.name}:w [dir=\"forward\" #{find_attributes(relation)}]\n"
-   end
+      output_port = "w"
+      input_port = "e"
+      sorting_order = "{rank = same; #{previous_node_name}; #{relation.helper.name};}"
+    end
+
+    "#{relation.start.name}:#{output_port} -> #{relation.helper.name}:#{input_port} [dir=\"none\" #{find_attributes(relation)}];
+     #{relation.helper.name}:#{output_port} -> #{relation.stop.name}:#{input_port} [dir=\"forward\" #{find_attributes(relation)}];
+     #{sorting_order}"
   end
 
   def write_effects(relation)

data/lib/vispan/node.rb

@@ -11,6 +11,7 @@ class Node
   end
 
   def transform_to_name(label, index)
-    label.gsub(/[-\s.]/, "") + index.to_s
+    label = label.gsub(/[-\s.]/, "") + index.to_s
+    label.gsub(/[\/\'|\"|\*|\\]/, "_")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vispan
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Daniel Witek