Issue 451: Fixed parameters in run.sh files

examples/virtual/1/run.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ../../../frenetic.native virtual_cmd\
-  vpol.kat\
-  vrel.kat\
-  vtopo.kat\
-  vingpol.kat\
-  ving.kat\
-  veg.kat\
-  ptopo.kat\
-  ping.kat\
-  peg.kat
+  --vpolicy vpol.kat\
+  --vrel vrel.kat\
+  --vtopo vtopo.kat\
+  --ving-pol vingpol.kat\
+  --ving ving.kat\
+  --veg veg.kat\
+  --ptopo ptopo.kat\
+  --ping ping.kat\
+  --peg peg.kat
 
 
 for arg in "g_fabric" "g_pruned" "pg" "vg" "g_raw" 

examples/virtual/2/run.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ../../../frenetic.native virtual_cmd\
-  vpol.kat\
-  vrel.kat\
-  vtopo.kat\
-  vingpol.kat\
-  ving.kat\
-  veg.kat\
-  ptopo.kat\
-  ping.kat\
-  peg.kat
+  --vpolicy vpol.kat\
+  --vrel vrel.kat\
+  --vtopo vtopo.kat\
+  --ving-pol vingpol.kat\
+  --ving ving.kat\
+  --veg veg.kat\
+  --ptopo ptopo.kat\
+  --ping ping.kat\
+  --peg peg.kat
 
 
 for arg in "g_fabric" "g_pruned" "pg" "vg" "g_raw" 

examples/virtual/big-switch/run.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ../../../frenetic.native virtual_cmd\
-  vpol.kat\
-  vrel.kat\
-  vtopo.kat\
-  vingpol.kat\
-  ving.kat\
-  veg.kat\
-  ptopo.kat\
-  ping.kat\
-  peg.kat
+  --vpol vpol.kat\
+  --vrel vrel.kat\
+  --vtopo vtopo.kat\
+  --ving-pol vingpol.kat\
+  --ving ving.kat\
+  --veg veg.kat\
+  --ptopo ptopo.kat\
+  --ping ping.kat\
+  --peg peg.kat
 
 
 for arg in "g_fabric" "g_pruned" "pg" "vg" "g_raw" 

examples/virtual/diamond/automaton2.dot

@@ -0,0 +1,84 @@
+digraph tdk {
+938 [label="Switch = Const(1)"];
+938 -> 937;
+938 -> 933 [style="dashed"];
+937 [label="Location = Const(0)"];
+937 -> 936;
+937 -> 857 [style="dashed"];
+936 [label="VFabric = Const(0)"];
+936 -> 935;
+936 -> 934 [style="dashed"];
+935 [shape=box label="[SetField(vlan, 5); Output(2)]"];
+934 [shape=box label="[SetField(vlan, 6); Output(4)]"];
+857 [label="Location = Const(2)"];
+857 -> 856;
+857 -> 0 [style="dashed"];
+856 [label="Vlan = Const(10)"];
+856 -> 851;
+856 -> 0 [style="dashed"];
+851 [shape=box label="[SetField(vlan, 11); Output(4)]"];
+0 [shape=box label="[]"];
+933 [label="Switch = Const(2)"];
+933 -> 932;
+933 -> 927 [style="dashed"];
+932 [label="Location = Const(1)"];
+932 -> 931;
+932 -> 0 [style="dashed"];
+931 [label="Vlan = Const(5)"];
+931 -> 930;
+931 -> 0 [style="dashed"];
+930 [label="VFabric = Const(0)"];
+930 -> 929;
+930 -> 928 [style="dashed"];
+929 [shape=box label="[SetField(vlan, 9); Output(3)]"];
+928 [shape=box label="[SetField(vlan, 10); Output(1)]"];
+927 [label="Switch = Const(3)"];
+927 -> 926;
+927 -> 921 [style="dashed"];
+926 [label="Location = Const(2)"];
+926 -> 925;
+926 -> 924 [style="dashed"];
+925 [label="Vlan = Const(9)"];
+925 -> 41;
+925 -> 0 [style="dashed"];
+41 [shape=box label="[Output(0)]"];
+924 [label="Location = Const(4)"];
+924 -> 923;
+924 -> 0 [style="dashed"];
+923 [label="Vlan = Const(12)"];
+923 -> 41;
+923 -> 922 [style="dashed"];
+922 [label="Vlan = Const(13)"];
+922 -> 41;
+922 -> 0 [style="dashed"];
+921 [label="Switch = Const(4)"];
+921 -> 920;
+921 -> 0 [style="dashed"];
+920 [label="Location = Const(1)"];
+920 -> 919;
+920 -> 0 [style="dashed"];
+919 [label="Vlan = Const(6)"];
+919 -> 918;
+919 -> 866 [style="dashed"];
+918 [shape=box label="[SetField(vlan, 13); Output(3)]"];
+866 [label="Vlan = Const(11)"];
+866 -> 861;
+866 -> 0 [style="dashed"];
+861 [shape=box label="[SetField(vlan, 12); Output(3)]"];
+{rank=same; 856 ;}
+{rank=same; 923 ;}
+{rank=same; 919 ;}
+{rank=same; 931 ;}
+{rank=same; 866 ;}
+{rank=same; 925 ;}
+{rank=same; 930 936 ;}
+{rank=same; 921 ;}
+{rank=same; 924 ;}
+{rank=same; 933 ;}
+{rank=same; 857 926 ;}
+{rank=same; 937 ;}
+{rank=same; 922 ;}
+{rank=same; 938 ;}
+{rank=same; 927 ;}
+{rank=same; 932 920 ;}
+}

examples/virtual/diamond/run.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ../../../frenetic.native virtual_cmd\
-  vpol.kat\
-  vrel.kat\
-  vtopo.kat\
-  vingpol.kat\
-  ving.kat\
-  veg.kat\
-  ptopo.kat\
-  ping.kat\
-  peg.kat
+  --vpolicy vpol.kat\
+  --vrel vrel.kat\
+  --vtopo vtopo.kat\
+  --ving-pol vingpol.kat\
+  --ving ving.kat\
+  --veg veg.kat\
+  --ptopo ptopo.kat\
+  --ping ping.kat\
+  --peg peg.kat
 
 
 for arg in "g_fabric" "g_pruned" "pg" "vg" "g_raw" 

examples/virtual/diamond2/run.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 ../../../frenetic.native virtual_cmd\
-  vpol.kat\
-  vrel.kat\
-  vtopo.kat\
-  vingpol.kat\
-  ving.kat\
-  veg.kat\
-  ptopo.kat\
-  ping.kat\
-  peg.kat
+  --vpolicy vpol.kat\
+  --vrel vrel.kat\
+  --vtopo vtopo.kat\
+  --ving-pol vingpol.kat\
+  --ving ving.kat\
+  --veg veg.kat\
+  --ptopo ptopo.kat\
+  --ping ping.kat\
+  --peg peg.kat
 
 
 for arg in "g_fabric" "g_pruned" "pg" "vg" "g_raw"