vispan 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ba877aba744f57e64be1228296c276a5439339
-  data.tar.gz: caa20bc5aa7d410a2b3bcd08e7fede30c59f5af9
+  metadata.gz: c00d545c86c8f83e10f5dbf39fadcc384271dca6
+  data.tar.gz: 934f4a88849dfa633e3357c58757e7266edbd6e0
 SHA512:
-  metadata.gz: 6fedd60956c362d4922dfd40530186eb46011585fed4f30c15bbb9b9ae60423124ffbf0fb42dbc599b550a6bb7d9479d0bacc1f0bf5dc91b8492e90f8463b053
-  data.tar.gz: c099cdd5296d6b5191d1df362ed38067dbb8938fc15354cbd3b43d0e439d6365e38e763c74c2827eea661bf577d82805fca243a4fd31bb38862fe3132fc807ed
+  metadata.gz: 488bca000babaa2f9382f5e051a785c9bf0c4f7e0f639c711ce66b981c46e70d70da3e879001203ac836d05b687ec9febb1c5553425502fce11c39b01313b2de
+  data.tar.gz: 625a53519aa63cb77692d307dbbb5860fa958420c878f6976c1e327210bafea13f4397aeab2dc2482c0eea244fd07f9ac6ed33c625875d0010a9369bc1ac7c8a

data/lib/vispan.rb

@@ -18,6 +18,9 @@ module Vispan
       @output = files[:output]
       @szenarios = []
       separate_szenarios(files[:input])
+      @szenarios.each do |szenario|
+        szenario.assign_ranks
+      end
     end
 
     def separate_szenarios(input_file)
@@ -34,7 +37,6 @@ module Vispan
           @relation_lines << line
         end
       end
-
       @szenarios << @single_szenario
     end
 

data/lib/vispan/config.rb

@@ -1,8 +1,8 @@
 NODE_WIDTH = 3.3
 NODE_MARGIN = 0.2
 
-GENERAL_SETTINGS = {graph:{rankdir:"LR", labeljust:"l", splines:"true" },
-                    node:{color:"none", shape:"rect", style:"rounded, filled", width:"#{NODE_WIDTH}", margin:"#{NODE_MARGIN}"},
+GENERAL_SETTINGS = {graph:{rankdir:"LR", labeljust:"l", splines:"true", concentrate: "true", ranksep:"2"},
+                    node:{shape:"rect", color:"none", style:"rounded, filled",  margin:"#{NODE_MARGIN}", width:"#{NODE_WIDTH}"},
                     edge:{}}
 
 SZENARIO = {szenario:{bgcolor:"mintcream:lightcyan", margin:60, fontsize:18}}
@@ -10,8 +10,9 @@ SZENARIO = {szenario:{bgcolor:"mintcream:lightcyan", margin:60, fontsize:18}}
 NODE = {screen:{fillcolor:"yellowgreen:lemonchiffon"},
         email:{fillcolor:"grey:ghostwhite"},
         pdf:{fillcolor:"gold:orange"},
-        command:{fillcolor:"lightblue:steelblue"}
+        command:{fillcolor:"lightblue:steelblue"},
+        helper:{shape:"plaintext", fillcolor:"none", width:"0.01", height:"0.01", margin:"0.15"}
         }
 RELATION = {event:{color:"red"},
-            link:{arrowhead:"none", arrowsize:"30"}
+            link:{arrowsize:"0.7", style:"dashed"}
             }

data/lib/vispan/graphwriter.rb

@@ -3,23 +3,43 @@ 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
 
   def build_szenario(szenario, index)
     node_definitions = szenario.nodes.map{|node| write_node(node)}.join("")
-    relation_definitions = szenario.relations.map{|relation| write_relations(relation)}.join("")
+    relation_definitions = szenario.relations.map{|relation| write_relations(relation, szenario)}.join("")
     effect_definitions = szenario.relations.map {|relation| write_effects(relation)}.join("")
 
     "\n\nsubgraph cluster#{index.to_s} {label=\"#{szenario.title}\"#{find_attributes(szenario)};\n#{node_definitions}\n#{relation_definitions}#{effect_definitions}}"
   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)
-    "#{relation.start.name} -> #{relation.stop.name} [label=\"#{relation.label}\" #{find_attributes(relation)}]\n"
+  def write_relations(relation, szenario)
+
+    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
   end
 
   def write_effects(relation)

data/lib/vispan/node.rb

@@ -1,12 +1,13 @@
 class Node
 
-  attr_accessor :name, :type, :label
-  NODE_TYPES = ["screen", "email", "pdf", "command"]
+  attr_accessor :name, :type, :label, :rank
+  NODE_TYPES = ["screen", "email", "pdf", "command", "helper"]
 
   def initialize(type, label, index)
     @name = transform_to_name(label, index)
     @type = NODE_TYPES.include?(type)? type : ""
     @label = label
+    @rank = 0
   end
 
   def transform_to_name(label, index)

data/lib/vispan/relation.rb

@@ -1,11 +1,13 @@
 class Relation
-  attr_accessor :start, :stop, :type, :effects, :label
+  attr_accessor :start, :stop, :type, :effects, :label, :helper
 
   def initialize(relation_array, index)
     @effects = []
     @label = ""
 
     extract(relation_array, index)
+    @helper = Node.new("helper", @label, index)
+    @helper.name = "helper_"+ @helper.name + @stop.name
   end
 
   def extract(relation_array, index)
@@ -42,4 +44,8 @@ class Relation
       }
     end
   end
+
+  def get_direction
+    @stop.rank - @start.rank
+  end
 end

data/lib/vispan/szenario.rb

@@ -24,8 +24,9 @@ class Szenario
   end
 
   def add_relation(relation)
+    add_nodes([relation.start, relation.stop, relation.helper, relation.effects])
+    replace_with_existing_nodes(relation, @nodes)
     @relations << relation
-    add_nodes([relation.start, relation.stop, relation.effects])
   end
 
   def add_nodes(nodes_array)
@@ -38,4 +39,33 @@ class Szenario
       return false if szenario_node.name == node.name
     end
   end
+
+  def replace_with_existing_nodes(relation, nodes)
+    nodes.each do |node|
+      relation.start = node if relation.start.name == node.name
+      relation.stop = node if relation.stop.name == node.name
+    end
+  end
+
+  def assign_ranks
+    rank = @relations.map{|relation|
+
+      if relation.start.rank == 0
+        relation.start.rank = 1
+        relation.stop.rank = 2 unless relation.stop.rank > 0
+      elsif relation.stop.rank == 0
+        relation.stop.rank = relation.start.rank + 1
+      end
+    }
+  end
+
+  def get_previous_helper_node(relation2)
+    @relations.each do |relation|
+
+      if relation2.start.name == relation.stop.name
+        return relation.helper.name
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vispan
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Daniel Witek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler