gisele 0.5.1 → 0.6.0

data/examples/union/minim.dot

@@ -0,0 +1,41 @@
+digraph G {
+  graph [margin="0" pack="true" rankdir="LR" ranksep="0"];
+  0 [color="black" fillcolor="green" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  1 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  2 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  3 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  5 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  6 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  7 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  8 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  9 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  10 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  11 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  12 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  13 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  14 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  15 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  16 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  0 -> 1 [arrowsize="0.7" label="[not(breast)] / RectalCancer:start"];
+  3 -> 4 [arrowsize="0.7" label="[not(breast)] / Endoscopy:start"];
+  4 -> 6 [arrowsize="0.7" label="Endoscopy:end"];
+  9 -> 11 [arrowsize="0.7" label="[breast and m_plus] / RadioChimio:start"];
+  11 -> 12 [arrowsize="0.7" label="RadioChimio:end"];
+  15 -> 16 [arrowsize="0.7" label="[breast] / BreastCancer:end"];
+  0 -> 1 [arrowsize="0.7" label="[breast] / BreastCancer:start"];
+  3 -> 5 [arrowsize="0.7" label="[breast] / Biopsy:start"];
+  2 -> 3 [arrowsize="0.7" label="Consultation:end"];
+  1 -> 2 [arrowsize="0.7" label="Consultation:start"];
+  6 -> 5 [arrowsize="0.7" label="Biopsy:start"];
+  9 -> 13 [arrowsize="0.7" label="[not(breast) and m_plus] / Chimio:start"];
+  13 -> 12 [arrowsize="0.7" label="Chimio:end"];
+  14 -> 15 [arrowsize="0.7" label="PostTreatment:end"];
+  12 -> 14 [arrowsize="0.7" label="PostTreatment:start"];
+  10 -> 12 [arrowsize="0.7" label="Radio:end"];
+  9 -> 10 [arrowsize="0.7" label="[not(m_plus)] / Radio:start"];
+  8 -> 9 [arrowsize="0.7" label="Staff:end"];
+  7 -> 8 [arrowsize="0.7" label="Staff:start"];
+  5 -> 7 [arrowsize="0.7" label="Biopsy:end"];
+  15 -> 16 [arrowsize="0.7" label="[not(breast)] / RectalCancer:end"];
+}

data/examples/union/rectal.gis

@@ -0,0 +1,20 @@
+task RectalCancer
+
+  # Is the cancer metastased
+  trackvar m_plus
+    {Staff:end}
+  initially false
+
+  seq
+    Consultation
+    Endoscopy
+    Biopsy
+    Staff
+    if m_plus
+      Chimio
+    else
+      Radio
+    end
+    PostTreatment
+  end
+end

data/examples/union/rectal/deterministic.dot

@@ -0,0 +1,37 @@
+digraph G {
+  graph [margin="0" pack="true" rankdir="LR" ranksep="0"];
+  0 [color="black" fillcolor="green" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  1 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  2 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  3 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  5 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  6 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  7 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  8 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  9 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  10 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  11 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  12 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  13 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  14 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  15 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  16 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  0 -> 1 [arrowsize="0.7" label="RectalCancer:start"];
+  1 -> 2 [arrowsize="0.7" label="Consultation:start"];
+  2 -> 3 [arrowsize="0.7" label="Consultation:end"];
+  3 -> 4 [arrowsize="0.7" label="Endoscopy:start"];
+  4 -> 5 [arrowsize="0.7" label="Endoscopy:end"];
+  5 -> 6 [arrowsize="0.7" label="Biopsy:start"];
+  6 -> 7 [arrowsize="0.7" label="Biopsy:end"];
+  7 -> 8 [arrowsize="0.7" label="Staff:start"];
+  8 -> 9 [arrowsize="0.7" label="Staff:end"];
+  9 -> 10 [arrowsize="0.7" label="[not(m_plus)] / Radio:start"];
+  9 -> 11 [arrowsize="0.7" label="[m_plus] / Chimio:start"];
+  10 -> 12 [arrowsize="0.7" label="Radio:end"];
+  11 -> 13 [arrowsize="0.7" label="Chimio:end"];
+  12 -> 14 [arrowsize="0.7" label="PostTreatment:start"];
+  13 -> 14 [arrowsize="0.7" label="PostTreatment:start"];
+  14 -> 15 [arrowsize="0.7" label="PostTreatment:end"];
+  15 -> 16 [arrowsize="0.7" label="RectalCancer:end"];
+}

data/examples/union/rectal/glts.dot

@@ -0,0 +1,59 @@
+digraph G {
+  graph [margin="0" pack="true" rankdir="LR" ranksep="0"];
+  0 [color="black" fillcolor="green" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  1 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  2 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  3 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  5 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  6 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  7 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  8 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  9 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  10 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  11 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  12 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  13 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  14 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  15 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  16 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  17 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  18 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  19 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  20 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  21 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  22 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  23 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  24 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  25 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  26 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  27 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 -> 6 [arrowsize="0.7" label="Consultation:start"];
+  6 -> 5 [arrowsize="0.7" label="Consultation:end"];
+  2 -> 4 [arrowsize="0.7" label=""];
+  7 -> 9 [arrowsize="0.7" label="Endoscopy:start"];
+  9 -> 8 [arrowsize="0.7" label="Endoscopy:end"];
+  5 -> 7 [arrowsize="0.7" label=""];
+  10 -> 12 [arrowsize="0.7" label="Biopsy:start"];
+  12 -> 11 [arrowsize="0.7" label="Biopsy:end"];
+  8 -> 10 [arrowsize="0.7" label=""];
+  13 -> 15 [arrowsize="0.7" label="Staff:start"];
+  15 -> 14 [arrowsize="0.7" label="Staff:end"];
+  11 -> 13 [arrowsize="0.7" label=""];
+  16 -> 18 [arrowsize="0.7" label=""];
+  19 -> 21 [arrowsize="0.7" label="Chimio:start"];
+  21 -> 20 [arrowsize="0.7" label="Chimio:end"];
+  18 -> 19 [arrowsize="0.7" label="[m_plus]"];
+  20 -> 17 [arrowsize="0.7" label=""];
+  22 -> 24 [arrowsize="0.7" label="Radio:start"];
+  24 -> 23 [arrowsize="0.7" label="Radio:end"];
+  18 -> 22 [arrowsize="0.7" label="[not(m_plus)]"];
+  23 -> 17 [arrowsize="0.7" label=""];
+  14 -> 16 [arrowsize="0.7" label=""];
+  25 -> 27 [arrowsize="0.7" label="PostTreatment:start"];
+  27 -> 26 [arrowsize="0.7" label="PostTreatment:end"];
+  17 -> 25 [arrowsize="0.7" label=""];
+  26 -> 3 [arrowsize="0.7" label=""];
+  0 -> 2 [arrowsize="0.7" label="RectalCancer:start"];
+  3 -> 1 [arrowsize="0.7" label="RectalCancer:end"];
+}

data/examples/union/rectal/minimal.dot

@@ -0,0 +1,35 @@
+digraph G {
+  graph [margin="0" pack="true" rankdir="LR" ranksep="0"];
+  0 [color="black" fillcolor="green" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  1 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  2 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  3 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  5 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  6 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  7 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  8 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  9 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  10 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  11 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  12 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  13 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  14 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  15 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  0 -> 1 [arrowsize="0.7" label="RectalCancer:start"];
+  1 -> 2 [arrowsize="0.7" label="Consultation:start"];
+  2 -> 3 [arrowsize="0.7" label="Consultation:end"];
+  3 -> 4 [arrowsize="0.7" label="Endoscopy:start"];
+  4 -> 5 [arrowsize="0.7" label="Endoscopy:end"];
+  5 -> 6 [arrowsize="0.7" label="Biopsy:start"];
+  6 -> 7 [arrowsize="0.7" label="Biopsy:end"];
+  7 -> 8 [arrowsize="0.7" label="Staff:start"];
+  8 -> 9 [arrowsize="0.7" label="Staff:end"];
+  9 -> 10 [arrowsize="0.7" label="[not(m_plus)] / Radio:start"];
+  9 -> 11 [arrowsize="0.7" label="[m_plus] / Chimio:start"];
+  10 -> 12 [arrowsize="0.7" label="Radio:end"];
+  12 -> 13 [arrowsize="0.7" label="PostTreatment:start"];
+  13 -> 14 [arrowsize="0.7" label="PostTreatment:end"];
+  14 -> 15 [arrowsize="0.7" label="RectalCancer:end"];
+  11 -> 12 [arrowsize="0.7" label="Chimio:end"];
+}

data/examples/union/rectal/wf.dot

@@ -0,0 +1,23 @@
+digraph G {
+  graph[]
+  V0 [shape="circle" style="filled" fillcolor="black" fixed="true" width="0.1" label=""]
+  V1 [shape="circle" style="filled" fillcolor="black" fixed="true" width="0.1" label=""]
+  V2 [shape="box" label="Consultation"]
+  V3 [shape="box" label="Endoscopy"]
+  V4 [shape="box" label="Biopsy"]
+  V5 [shape="box" label="Staff"]
+  V6 [shape="diamond" label="m_plus"]
+  V7 [shape="box" label="Chimio"]
+  V8 [shape="box" label="Radio"]
+  V9 [shape="box" label="PostTreatment"]
+  V2 -> V3 []
+  V3 -> V4 []
+  V4 -> V5 []
+  V5 -> V6 []
+  V7 -> V9 []
+  V6 -> V7 [label="true"]
+  V8 -> V9 []
+  V6 -> V8 [label="false"]
+  V9 -> V1 []
+  V0 -> V2 []
+}

data/examples/union/union.gis

@@ -0,0 +1,48 @@
+task Union
+
+  task RectalCancer
+
+    # Is the cancer metastased
+    trackvar m_plus
+      {Staff:end}
+    initially false
+
+    seq
+      Consultation
+      Endoscopy
+      Biopsy
+      Staff
+      if m_plus
+        Chimio
+      else
+        Radio
+      end
+      PostTreatment
+    end
+  end
+
+  task BreastCancer
+
+    # Is the cancer metastased
+    trackvar m_plus
+      {Staff:end}
+    initially false
+
+    seq
+      Consultation
+      Endoscopy
+      Staff
+      if m_plus
+        RadioChimio
+      else
+        Radio
+      end
+      PostTreatment
+    end
+  end
+
+  par
+    RectalCancer
+    PostTreatment
+  end
+end

data/examples/union/union.rb

@@ -0,0 +1,39 @@
+require 'gisele-analysis'
+
+def debug(wf, name)
+  where = (Path.dir/name)
+  where.mkdir_p
+  (where/"wf.dot").write(wf.to_dot)
+  glts = wf.to_glts
+  (where/"glts.dot").write(glts.to_dot)
+  deterministic = glts.determinize
+  (where/"deterministic.dot").write(deterministic.to_dot)
+  minimal = deterministic.minimize
+  (where/"minimal.dot").write(minimal.to_dot)
+  minimal
+end
+
+Gisele::Analysis.session do |s|
+
+  s.trackvar :breast, []
+  s.trackvar :m_plus, ["Staff:end"], false
+
+  wf1 = s.ghmsc do |g|
+    g.source = (Path.dir/"breast.gis").read
+    g.c0 = "breast"
+  end
+
+  wf2 = s.ghmsc do |g|
+    g.source = (Path.dir/"rectal.gis").read
+    g.c0 = "not(breast)"
+  end
+
+  g1 = debug(wf1, "breast")
+  g2 = debug(wf2, "rectal")
+
+  merged = g1 | g2
+  (Path.dir/"merged.dot").write(merged.to_dot)
+  minim = merged.minimize
+  (Path.dir/"minim.dot").write(minim.to_dot)
+end
+

data/examples/while/while.dot

@@ -0,0 +1,30 @@
+digraph G {
+  graph [margin="0" pack="true" rankdir="LR" ranksep="0"];
+  0 [color="black" fillcolor="green" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  1 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  2 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  3 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  4 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  5 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  6 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  7 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  8 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  9 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  10 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  11 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  12 [color="black" fillcolor="white" fixedsize="true" height="0.6" shape="circle" style="filled" width="0.6"];
+  0 -> 1 [arrowsize="0.7" label="WhileExample:start"];
+  1 -> 2 [arrowsize="0.7" label="Consultation:start"];
+  2 -> 3 [arrowsize="0.7" label="Consultation:end"];
+  4 -> 6 [arrowsize="0.7" label="[bad] / Staff:end"];
+  6 -> 7 [arrowsize="0.7" label="[bad] / Consultation:start"];
+  7 -> 8 [arrowsize="0.7" label="[bad] / Consultation:end"];
+  3 -> 9 [arrowsize="0.7" label="[bad]"];
+  9 -> 4 [arrowsize="0.7" label="[bad] / Staff:start"];
+  3 -> 10 [arrowsize="0.7" label="[not(bad)]"];
+  10 -> 5 [arrowsize="0.7" label="[not(bad)] / WhileExample:end"];
+  8 -> 11 [arrowsize="0.7" label="[bad]"];
+  11 -> 4 [arrowsize="0.7" label="[bad] / Staff:start"];
+  8 -> 12 [arrowsize="0.7" label="[not(bad)]"];
+  12 -> 5 [arrowsize="0.7" label="[not(bad)] / WhileExample:end"];
+}

data/examples/while/while.gis

@@ -0,0 +1,10 @@
+task WhileExample
+  trackvar bad {Consultation:end}
+  seq
+    Consultation
+    while bad
+      Staff
+      Consultation
+    end
+  end
+end

data/gisele.gemspec

@@ -125,12 +125,11 @@ Gem::Specification.new do |s|
   #
   s.add_development_dependency("rake", "~> 0.9.2")
   s.add_development_dependency("rspec", "~> 2.11")
-  s.add_dependency("path", "~> 1.2")
+  s.add_dependency("path", "~> 1.3")
   s.add_dependency("quickl", "~> 0.4.3")
   s.add_dependency("awesome_print", "~> 1.0")
   s.add_dependency("yargi", "~> 0.2.0")
-  s.add_dependency("stamina-core", "~> 0.5.3")
-  s.add_dependency("gisele-language", "~> 0.5.0")
+  s.add_dependency("gisele-analysis", "~> 0.6.0")
 
   # The version of ruby required by this gem
   #

data/gisele.noespec

@@ -10,7 +10,7 @@ variables:
   upper:
     Gisele
   version:
-    0.5.1
+    0.6.0
   summary: |-
     Gisele is a Process Analyzer Toolset
   description: |-
@@ -21,11 +21,10 @@ variables:
   links:
     - https://github.com/blambeau/gisele
   dependencies:
-    - {name: path,            version: "~> 1.2",    groups: [runtime]}
+    - {name: path,            version: "~> 1.3",    groups: [runtime]}
     - {name: quickl,          version: "~> 0.4.3",  groups: [runtime]}
     - {name: awesome_print,   version: "~> 1.0",    groups: [runtime]}
     - {name: yargi,           version: "~> 0.2.0",  groups: [runtime]}
-    - {name: stamina-core,    version: "~> 0.5.4",  groups: [runtime]}
-    - {name: gisele-language, version: "~> 0.5.0",  groups: [runtime]}
+    - {name: gisele-analysis, version: "~> 0.6.0",  groups: [runtime]}
     - {name: rake,            version: "~> 0.9.2",  groups: [development]}
     - {name: rspec,           version: "~> 2.11",   groups: [development]}

data/lib/gisele.rb

@@ -8,4 +8,3 @@ module Gisele
 
   extend(self)
 end # module Gisele
-require_relative 'gisele/compiling'

data/lib/gisele/command.rb

@@ -50,6 +50,19 @@ module Gisele
         @compile_mode = [:glts, (value || "dot").to_sym]
       end
 
+      opt.on('-d', '--deterministic',
+             'Determinize gtls output?') do
+        @determinize = true
+      end
+      opt.on('-e', '--explicit',
+             'Explicit guards in gtls output?') do
+        @explicit = true
+      end
+      opt.on('-s', '--separate',
+             'Split guards from events in glts output?') do
+        @separate = true
+      end
+
       opt.on_tail('--help', "Show this help message") do
         raise Quickl::Help
       end
@@ -81,17 +94,26 @@ module Gisele
     end
 
     def compile_graph(ast, option)
-      graphs = Gisele::Compiling::ToGraph.call(ast)
-      graphs.each do |graph|
-        puts graph.to_dot
-      end
+      graph = Analysis::Compiling::Ast2Graph.call(ast)
+      puts graph.to_dot
     end
 
-    def compile_glts(ast, option)
-      glts = Gisele::Compiling::ToGlts.call(ast)
-      glts.each do |g|
-        puts g.to_dot(&Gisele::Compiling::ToGlts::DOT_REWRITER)
+    def compile_glts(ast, mode)
+      session = Analysis::Compiling::Ast2Session.call(ast)
+      glts    = Analysis::Compiling::Ast2Glts.call(session, ast)
+      glts    = glts.determinize if @determinize
+      glts    = glts.separate    if @separate
+      glts    = glts.explicit_guards! if @explicit
+      case mode
+      when :dot      then puts glts.to_dot
+      when :ruby     then puts glts.to_ruby_literal
+      when :text     then puts glts.to_relation.to_text
+      when :rash     then puts glts.to_relation.to_rash
+      else
+        raise "Unrecognized --glts output mode `mode`"
       end
+    ensure
+      session.close if session
     end
 
 end # class Command