gisele 0.5.1 → 0.6.0

data/examples/merge/BreastCancer.dot

@@ -1,30 +0,0 @@
-digraph G {
-  graph [rankdir="LR"];
-  10 [color="black" fillcolor="green" shape="circle" style="filled"];
-  16 [color="black" fillcolor="white" shape="circle" style="filled"];
-  15 [color="black" fillcolor="white" shape="circle" style="filled"];
-  19 [color="black" fillcolor="white" shape="circle" style="filled"];
-  18 [color="black" fillcolor="white" shape="circle" style="filled"];
-  112 [color="black" fillcolor="white" shape="circle" style="filled"];
-  115 [color="black" fillcolor="white" shape="circle" style="filled"];
-  118 [color="black" fillcolor="white" shape="circle" style="filled"];
-  117 [color="black" fillcolor="white" shape="circle" style="filled"];
-  123 [color="black" fillcolor="white" shape="circle" style="filled"];
-  126 [color="black" fillcolor="white" shape="circle" style="filled"];
-  132 [color="black" fillcolor="white" shape="circle" style="filled"];
-  129 [color="black" fillcolor="white" shape="circle" style="filled"];
-  10 -> 16 [label="Diagnosis:start"];
-  16 -> 15 [label="Diagnosis:end"];
-  15 -> 19 [label="Psy:start"];
-  19 -> 18 [label="Psy:end"];
-  18 -> 112 [label="Staff:start"];
-  112 -> 115 [label="Staff:end"];
-  115 -> 118 [label="[t] / Radio:start"];
-  118 -> 117 [label="Radio:end"];
-  123 -> 126 [label="Chimio:end"];
-  129 -> 117 [label="Consultation:end"];
-  126 -> 129 [label="[not(ok)] / Consultation:start"];
-  132 -> 117 [label="Radio:end"];
-  126 -> 132 [label="[ok] / Radio:start"];
-  115 -> 123 [label="[not(t)] / Chimio:start"];
-}

data/examples/merge/BreastCancer.gis

@@ -1,17 +0,0 @@
-task BreastCancer
-  seq
-    Diagnosis
-    Psy
-    Staff
-    if t
-      Radio
-    else
-      Chimio
-      if not(ok)
-        Consultation
-      else
-        Radio
-      end
-    end
-  end
-end

data/examples/merge/Merge.dot

@@ -1,46 +0,0 @@
-digraph G {
-  graph [rankdir="LR"];
-
-  20 [color="black" fillcolor="orange" shape="circle" style="filled"];
-  26 [color="black" fillcolor="orange" shape="circle" style="filled"];
-  25 [color="black" fillcolor="orange" shape="circle" style="filled"];
-
-  19 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  18 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  112 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  115 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  118 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  117 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  123 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  126 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-  129 [color="black" fillcolor="yellow" shape="circle" style="filled"];
-
-  29 [color="black" fillcolor="red" shape="circle" style="filled"];
-  212 [color="black" fillcolor="red" shape="circle" style="filled"];
-  217 [color="black" fillcolor="red" shape="circle" style="filled"];
-  220 [color="black" fillcolor="red" shape="circle" style="filled"];
-
-  117 [color="black" fillcolor="orange" shape="circle" style="filled"];
-
-  20 -> 26 [label="Diagnosis:start"];
-  26 -> 25 [label="Diagnosis:end"];
-  25 -> 19 [label="[wf1] / Psy:start"];
-  19 -> 18 [label="Psy:end"];
-  18 -> 112 [label="Staff:start"];
-  112 -> 115 [label="Staff:end"];
-  115 -> 118 [label="[t] / Radio:start"];
-  118 -> 117 [label="Radio:end"];
-  123 -> 126 [label="Chimio:end"];
-  129 -> 117 [label="Consultation:end"];
-  126 -> 129 [label="[not(ok)] / Consultation:start"];
-  126 -> 118 [label="[ok] / Radio:start"];
-  115 -> 123 [label="[not(t)] / Chimio:start"];
-
-  25 -> 29 [label="[wf2] / Staff:start"];
-  29 -> 212 [label="Staff:end"];
-  217 -> 220 [label="Chimio:end"];
-  220 -> 29 [label="[not(ok)] / Staff:start"];
-  212 -> 217 [label="[not(t and m)] / Chimio:start"];
-  212 -> 118 [label="[t and m] / Radio:start"]
-  220 -> 118 [label="[ok] / Radio:start"]
-}

data/examples/merge/RectalCancer.dot

@@ -1,22 +0,0 @@
-digraph G {
-  graph [rankdir="LR"];
-  20 [color="black" fillcolor="green" shape="circle" style="filled"];
-  26 [color="black" fillcolor="white" shape="circle" style="filled"];
-  25 [color="black" fillcolor="white" shape="circle" style="filled"];
-  29 [color="black" fillcolor="white" shape="circle" style="filled"];
-  212 [color="black" fillcolor="white" shape="circle" style="filled"];
-  217 [color="black" fillcolor="white" shape="circle" style="filled"];
-  220 [color="black" fillcolor="white" shape="circle" style="filled"];
-  226 [color="black" fillcolor="white" shape="circle" style="filled"];
-  225 [color="black" fillcolor="white" shape="circle" style="filled"];
-  20 -> 26 [label="Diagnosis:start"];
-  26 -> 25 [label="Diagnosis:end"];
-  25 -> 29 [label="Staff:start"];
-  29 -> 212 [label="Staff:end"];
-  217 -> 220 [label="Chimio:end"];
-  220 -> 29 [label="[not(ok)] / Staff:start"];
-  212 -> 217 [label="[not(t and m)] / Chimio:start"];
-  226 -> 225 [label="Radio:end"];
-  212 -> 226 [label="[t and m] / Radio:start"]
-  220 -> 226 [label="[ok] / Radio:start"]
-}

data/examples/merge/RectalCancer.gis

@@ -1,15 +0,0 @@
-task RectalCancer
-
-  seq
-    Diagnosis
-    Staff
-    if not(t and m)
-      Chimio
-      while not(ok)
-        Chimio
-      end
-    end
-    Radio
-  end
-
-end

data/lib/gisele/compiling.rb

@@ -1,2 +0,0 @@
-require_relative 'compiling/to_graph'
-require_relative 'compiling/to_glts'

data/lib/gisele/compiling/to_glts.rb

@@ -1,125 +0,0 @@
-module Gisele
-  module Compiling
-    class ToGlts < Sexpr::Rewriter
-      grammar Language
-
-      DOT_REWRITER = lambda{|elm,kind|
-        case kind
-          when :automaton
-            {:rankdir => "LR"}
-          when :state
-            {:shape => "circle",
-             :style => "filled",
-             :color => "black",
-             :fillcolor => (elm.initial? ? "green" : "white")}
-          when :edge
-            label = elm[:guard] ? "[#{elm[:guard].label}]" : elm[:symbol]
-            {:label => label || ''}
-        end
-      }
-
-      # if/elsif/else -> guarded commands
-      use Language::IfToCase
-
-      def on_unit_def(sexpr)
-        sexpr.
-          sexpr_body.
-          select{|n| n.first == :task_def}.
-          map{|taskdef| apply(taskdef) }
-      end
-
-      def on_task_def(sexpr)
-        @glts = Stamina::Automaton.new
-
-        entry = add_state(sexpr, :initial => true)
-        exit  = add_state(sexpr)
-        c_entry, c_exit = apply(sexpr.last)
-        connect(entry, c_entry)
-        connect(c_exit, exit)
-
-        @glts
-      end
-
-      def on_seq_st(sexpr)
-        mine    = entry_and_exit(sexpr)
-        current = mine.first
-        sexpr.sexpr_body.each do |child|
-          c_entry, c_exit = apply(child)
-          connect(current, c_entry)
-          current = c_exit
-        end
-        connect(current, mine.last)
-        mine
-      end
-      alias :on_par_st :on_seq_st
-
-      def on_case_st(sexpr)
-        cond, *clauses = sexpr.sexpr_body
-
-        entry, exit = entry_and_exit(sexpr)
-
-        diamond = add_state(sexpr)
-        connect(entry, diamond)
-
-        clauses.each do |clause|
-          c_entry, c_exit = apply(clause.last)
-          connect(diamond, c_entry, clause[1])
-          connect(c_exit, exit)
-        end
-
-        [entry, exit]
-      end
-
-      def on_while_st(sexpr)
-        cond, dost, = sexpr.sexpr_body
-
-        entry, exit = entry_and_exit(sexpr)
-
-        diamond = add_state(sexpr)
-        connect(entry, diamond)
-
-        c_entry, c_exit = apply(sexpr.last)
-
-        connect(diamond, exit, cond.negate)
-        connect(diamond, c_entry, cond)
-        connect(c_exit, diamond)
-
-        [entry, exit]
-      end
-
-      def on_task_call_st(sexpr)
-        entry, exit = entry_and_exit(sexpr)
-        middle = add_state(sexpr)
-        connect(entry, middle, transition(sexpr, "start"))
-        connect(middle, exit, transition(sexpr, "end"))
-        [entry, exit]
-      end
-
-      private
-
-      def entry_and_exit(sexpr)
-        @glts.add_n_states(2)
-      end
-
-      def add_state(sexpr, attrs = nil)
-        @glts.add_state(attrs || {})
-      end
-
-      def connect(source, target, attrs = {:symbol => nil})
-        attrs = transition(attrs) unless Hash===attrs
-        @glts.connect(source, target, attrs)
-      end
-
-      def transition(sexpr, kind = nil)
-        raise UnexpectedNodeError, "Node expected, got #{sexpr}" unless Sexpr===sexpr
-        case sexpr.first
-        when :task_call_st then {:symbol => "#{sexpr.label}:#{kind}"}
-        when :bool_expr    then {:symbol => "[guard]", :guard => sexpr}
-        else
-          raise UnexpectedNodeError, "Unexpected event kind #{sexpr.inspect}"
-        end
-      end
-
-    end # class ToGlts
-  end # module Compiling
-end # module Gisele

data/lib/gisele/compiling/to_graph.rb

@@ -1,160 +0,0 @@
-module Gisele
-  module Compiling
-    class ToGraph < Sexpr::Rewriter
-      grammar Language
-
-      # We do not support the elsif syntactic sugar here; rewrite it as 'else if'.
-      use Language::ElsifFlattener
-
-      # This is a marker for the graph nodes we can remove later.
-      module Connector; end
-
-      def on_unit_def(sexpr)
-        sexpr.
-          sexpr_body.
-          select{|n| n.first == :task_def}.
-          map{|taskdef| apply(taskdef) }
-      end
-
-      def on_task_def(sexpr)
-        @graph = Yargi::Digraph.new
-
-        entry, exit = add_vertex(sexpr), add_vertex(sexpr)
-        c_entry, c_exit = apply(sexpr.last)
-        connect(entry, c_entry)
-        connect(c_exit, exit)
-
-        @graph.vertices(Connector).each do |vertex|
-          next unless vertex.out_edges.size == 1
-          target = vertex.out_edges.first.target
-          @graph.reconnect(vertex.in_edges, nil, target)
-          @graph.remove_vertex(vertex)
-        end
-
-        @graph
-      end
-
-      def on_seq_st(sexpr)
-        mine    = entry_and_exit(sexpr)
-        current = mine.first
-        sexpr.sexpr_body.each do |child|
-          c_entry, c_exit = apply(child)
-          connect(current, c_entry)
-          current = c_exit
-        end
-        connect(current, mine.last)
-        mine
-      end
-
-      def on_par_st(sexpr)
-        entry, exit = add_vertex(sexpr), add_vertex(sexpr)
-        sexpr.sexpr_body.each do |child|
-          c_entry, c_exit = apply(child)
-          connect(entry, c_entry)
-          connect(c_exit, exit)
-        end
-        [entry, exit]
-      end
-
-      def on_if_st(sexpr)
-        cond, then_clause, else_clause, = sexpr.sexpr_body
-
-        entry, exit = entry_and_exit(sexpr)
-
-        diamond = add_vertex(sexpr)
-        connect(entry, diamond)
-
-        c_entry, c_exit = apply(then_clause)
-        connect(diamond, c_entry, true_ast_sexpr)
-        connect(c_exit, exit)
-
-        if else_clause
-          c_entry, c_exit = apply(else_clause.last)
-          connect(diamond, c_entry, false_ast_sexpr)
-          connect(c_exit, exit)
-        else
-          connect(diamond, exit, false_ast_sexpr)
-        end
-
-        [entry, exit]
-      end
-
-      def on_case_st(sexpr)
-        cond, *clauses = sexpr.sexpr_body
-
-        entry, exit = entry_and_exit(sexpr)
-
-        diamond = add_vertex(sexpr)
-        connect(entry, diamond)
-
-        clauses.each do |clause|
-          c_entry, c_exit = apply(clause.last)
-          connect(diamond, c_entry, clause)
-          connect(c_exit, exit)
-        end
-
-        [entry, exit]
-      end
-
-
-      def on_while_st(sexpr)
-        cond, dost, = sexpr.sexpr_body
-
-        entry, exit = entry_and_exit(sexpr)
-
-        diamond = add_vertex(sexpr)
-        connect(entry, diamond)
-
-        c_entry, c_exit = apply(sexpr.last)
-
-        connect(diamond, exit,    false_ast_sexpr)
-        connect(diamond, c_entry, true_ast_sexpr)
-        connect(c_exit, diamond)
-
-        [entry, exit]
-      end
-
-      def on_task_call_st(sexpr)
-        entry, exit = entry_and_exit(sexpr)
-        task = add_vertex(sexpr)
-        connect(entry, task)
-        connect(task, exit)
-        [entry, exit]
-      end
-
-      private
-
-      def add_vertex(sexpr)
-        @graph.add_vertex(dot_attributes(sexpr))
-      end
-
-      def entry_and_exit(sexpr, tag = Connector)
-        @graph.add_n_vertices(2, tag)
-      end
-
-      def connect(source, target, sexpr = nil)
-        @graph.connect(source, target, dot_attributes(sexpr))
-      end
-
-      def false_ast_sexpr
-        sexpr(parse("false", :root => :bool_expr))
-      end
-
-      def true_ast_sexpr
-        sexpr(parse("true", :root => :bool_expr))
-      end
-
-      DOT_ATTRIBUTES = YAML.load_file(Path.dir/"to_graph.yml")
-      def dot_attributes(sexpr)
-        if Sexpr===sexpr
-          attrs = DOT_ATTRIBUTES["graphviz"][sexpr.first.to_s] || {}
-          attrs = attrs.merge(:label => sexpr.label) if sexpr.respond_to?(:label)
-          attrs
-        else
-          {} # sometimes, sexpr is simply nil
-        end
-      end
-
-    end # class ToGraph
-  end # module Compiling
-end # module Gisele

data/lib/gisele/compiling/to_graph.yml

@@ -1,20 +0,0 @@
-graphviz:
-  task_def:
-    shape: circle
-    style: filled
-    fillcolor: black
-    fixed: true
-    width: 0.1
-  task_call_st:
-    shape: box
-  while_st:
-    shape: diamond
-  if_st:
-    shape: diamond
-  case_st:
-    shape: diamond
-  par_st:
-    shape: box
-    height: 0.1
-    style: filled
-    fillcolor: black