more learned models added and relearned models with new adapter

diff --git a/a4/tcp/results/learnedModel.full.KV.rand.19sec.dot b/a4/tcp/results/learnedModel.full.KV.rand.19sec.dot
new file mode 100644 (file)
index 0000000..476c656
--- /dev/null
+++ b/a4/tcp/results/learnedModel.full.KV.rand.19sec.dot
@@ -0,0 +1,36 @@
+digraph g {
+__start0 [label="" shape="none"];
+
+       s0 [shape="circle" label="0"];
+       s1 [shape="circle" label="1"];
+       s2 [shape="circle" label="2"];
+       s3 [shape="circle" label="3"];
+       s4 [shape="circle" label="4"];
+       s0 -> s2 [label="SYN / SYN-ACK"];
+       s0 -> s1 [label="ACK / ERR"];
+       s0 -> s1 [label="DAT / ERR"];
+       s0 -> s1 [label="RST / ERR"];
+       s0 -> s1 [label="FIN / ERR"];
+       s1 -> s1 [label="SYN / ERR"];
+       s1 -> s1 [label="ACK / ERR"];
+       s1 -> s1 [label="DAT / ERR"];
+       s1 -> s1 [label="RST / ERR"];
+       s1 -> s1 [label="FIN / ERR"];
+       s2 -> s1 [label="SYN / ERR"];
+       s2 -> s1 [label="ACK / ERR"];
+       s2 -> s3 [label="DAT / ACK"];
+       s2 -> s0 [label="RST / Reset"];
+       s2 -> s4 [label="FIN / ACK"];
+       s3 -> s1 [label="SYN / ERR"];
+       s3 -> s1 [label="ACK / ERR"];
+       s3 -> s3 [label="DAT / DATA"];
+       s3 -> s0 [label="RST / Reset"];
+       s3 -> s4 [label="FIN / ACK"];
+       s4 -> s4 [label="SYN / Closed"];
+       s4 -> s4 [label="ACK / Closed"];
+       s4 -> s4 [label="DAT / Closed"];
+       s4 -> s4 [label="RST / Closed"];
+       s4 -> s4 [label="FIN / Closed"];
+
+__start0 -> s0;
+}

diff --git a/a4/tcp/results/learnedModel.full.LStar.rand.46sec.dot b/a4/tcp/results/learnedModel.full.LStar.rand.44sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.full.LStar.rand.46sec.dot
rename to a4/tcp/results/learnedModel.full.LStar.rand.44sec.dot

diff --git a/a4/tcp/results/learnedModel.full.TTT.wm.2692sec.dot b/a4/tcp/results/learnedModel.full.RS.rand.12sec.dot
similarity index 65%
rename from a4/tcp/results/learnedModel.full.TTT.wm.2692sec.dot
rename to a4/tcp/results/learnedModel.full.RS.rand.12sec.dot
index 5db1c7b..c685f62 100644 (file)
--- a/a4/tcp/results/learnedModel.full.TTT.wm.2692sec.dot
+++ b/a4/tcp/results/learnedModel.full.RS.rand.12sec.dot
@@ -1,11 +1,10 @@
 digraph g {
 __start0 [label="" shape="none"];
 
-       s0 [shape="circle" label="s0"];
-       s1 [shape="circle" label="s1"];
-       s2 [shape="circle" label="s2"];
-       s3 [shape="circle" label="s3"];
-       s4 [shape="circle" label="s4"];
+       s0 [shape="circle" label="0"];
+       s1 [shape="circle" label="1"];
+       s2 [shape="circle" label="2"];
+       s3 [shape="circle" label="3"];
        s0 -> s1 [label="SYN / SYN-ACK"];
        s0 -> s3 [label="ACK / ERR"];
        s0 -> s3 [label="DAT / ERR"];
@@ -13,7 +12,7 @@ __start0 [label="" shape="none"];
        s0 -> s3 [label="FIN / ERR"];
        s1 -> s3 [label="SYN / ERR"];
        s1 -> s3 [label="ACK / ERR"];
-       s1 -> s4 [label="DAT / ACK"];
+       s1 -> s1 [label="DAT / ACK"];
        s1 -> s0 [label="RST / Reset"];
        s1 -> s2 [label="FIN / ACK"];
        s2 -> s2 [label="SYN / Closed"];
@@ -26,11 +25,6 @@ __start0 [label="" shape="none"];
        s3 -> s3 [label="DAT / ERR"];
        s3 -> s3 [label="RST / ERR"];
        s3 -> s3 [label="FIN / ERR"];
-       s4 -> s3 [label="SYN / ERR"];
-       s4 -> s3 [label="ACK / ERR"];
-       s4 -> s4 [label="DAT / DATA"];
-       s4 -> s0 [label="RST / Reset"];
-       s4 -> s2 [label="FIN / ACK"];
 
 __start0 -> s0;
 }

diff --git a/a4/tcp/results/learnedModel.full.TTT.rand.26sec.dot b/a4/tcp/results/learnedModel.full.TTT.rand.25sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.full.TTT.rand.26sec.dot
rename to a4/tcp/results/learnedModel.full.TTT.rand.25sec.dot

diff --git a/a4/tcp/results/learnedModel.full.TTT.wm.2673sec.dot b/a4/tcp/results/learnedModel.full.TTT.wm.2632sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.full.TTT.wm.2673sec.dot
rename to a4/tcp/results/learnedModel.full.TTT.wm.2632sec.dot

diff --git a/a4/tcp/results/learnedModel.partial.KV.rand.22sec.dot b/a4/tcp/results/learnedModel.partial.KV.rand.22sec.dot
new file mode 100644 (file)
index 0000000..bbebb2f
--- /dev/null
+++ b/a4/tcp/results/learnedModel.partial.KV.rand.22sec.dot
@@ -0,0 +1,22 @@
+digraph g {
+__start0 [label="" shape="none"];
+
+       s0 [shape="circle" label="0"];
+       s1 [shape="circle" label="1"];
+       s2 [shape="circle" label="2"];
+       s3 [shape="circle" label="3"];
+       s0 -> s2 [label="SYN / SYN-ACK"];
+       s0 -> s1 [label="ACK / ERR"];
+       s0 -> s1 [label="DAT / ERR"];
+       s1 -> s1 [label="SYN / ERR"];
+       s1 -> s1 [label="ACK / ERR"];
+       s1 -> s1 [label="DAT / ERR"];
+       s2 -> s1 [label="SYN / ERR"];
+       s2 -> s1 [label="ACK / ERR"];
+       s2 -> s3 [label="DAT / ACK"];
+       s3 -> s1 [label="SYN / ERR"];
+       s3 -> s1 [label="ACK / ERR"];
+       s3 -> s3 [label="DAT / DATA"];
+
+__start0 -> s0;
+}

diff --git a/a4/tcp/results/learnedModel.partial.LStar.wm.388sec.dot b/a4/tcp/results/learnedModel.partial.KV.wm.383sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.partial.LStar.wm.388sec.dot
rename to a4/tcp/results/learnedModel.partial.KV.wm.383sec.dot

diff --git a/a4/tcp/results/learnedModel.partial.TTT.wm.391sec.dot b/a4/tcp/results/learnedModel.partial.LStar.wm.384sec.dot
similarity index 77%
rename from a4/tcp/results/learnedModel.partial.TTT.wm.391sec.dot
rename to a4/tcp/results/learnedModel.partial.LStar.wm.384sec.dot
index 3eab61f..65a17e4 100644 (file)
--- a/a4/tcp/results/learnedModel.partial.TTT.wm.391sec.dot
+++ b/a4/tcp/results/learnedModel.partial.LStar.wm.384sec.dot
@@ -1,10 +1,10 @@
 digraph g {
 __start0 [label="" shape="none"];
 
-       s0 [shape="circle" label="s0"];
-       s1 [shape="circle" label="s1"];
-       s2 [shape="circle" label="s2"];
-       s3 [shape="circle" label="s3"];
+       s0 [shape="circle" label="0"];
+       s1 [shape="circle" label="1"];
+       s2 [shape="circle" label="2"];
+       s3 [shape="circle" label="3"];
        s0 -> s1 [label="SYN / SYN-ACK"];
        s0 -> s2 [label="ACK / ERR"];
        s0 -> s2 [label="DAT / ERR"];

diff --git a/a4/tcp/results/learnedModel.full.TTT.wm.dot b/a4/tcp/results/learnedModel.partial.RS.rand.13sec.dot
similarity index 63%
rename from a4/tcp/results/learnedModel.full.TTT.wm.dot
rename to a4/tcp/results/learnedModel.partial.RS.rand.13sec.dot
index b4c1e2b..65a17e4 100644 (file)
--- a/a4/tcp/results/learnedModel.full.TTT.wm.dot
+++ b/a4/tcp/results/learnedModel.partial.RS.rand.13sec.dot
@@ -1,26 +1,22 @@
 digraph g {
 __start0 [label="" shape="none"];
 
-       s0 [shape="circle" label="s0"];
-       s1 [shape="circle" label="s1"];
-       s2 [shape="circle" label="s2"];
-       s3 [shape="circle" label="s3"];
+       s0 [shape="circle" label="0"];
+       s1 [shape="circle" label="1"];
+       s2 [shape="circle" label="2"];
+       s3 [shape="circle" label="3"];
        s0 -> s1 [label="SYN / SYN-ACK"];
        s0 -> s2 [label="ACK / ERR"];
        s0 -> s2 [label="DAT / ERR"];
-       s0 -> s2 [label="RST / ERR"];
        s1 -> s2 [label="SYN / ERR"];
        s1 -> s2 [label="ACK / ERR"];
        s1 -> s3 [label="DAT / ACK"];
-       s1 -> s0 [label="RST / Reset"];
        s2 -> s2 [label="SYN / ERR"];
        s2 -> s2 [label="ACK / ERR"];
        s2 -> s2 [label="DAT / ERR"];
-       s2 -> s2 [label="RST / ERR"];
        s3 -> s2 [label="SYN / ERR"];
        s3 -> s2 [label="ACK / ERR"];
        s3 -> s3 [label="DAT / DATA"];
-       s3 -> s0 [label="RST / Reset"];
 
 __start0 -> s0;
 }

diff --git a/a4/tcp/results/learnedModel.full.LStar.wm.2686sec.dot b/a4/tcp/results/learnedModel.partial.RS.wm.384sec.dot
similarity index 55%
rename from a4/tcp/results/learnedModel.full.LStar.wm.2686sec.dot
rename to a4/tcp/results/learnedModel.partial.RS.wm.384sec.dot
index 2c5e774..65a17e4 100644 (file)
--- a/a4/tcp/results/learnedModel.full.LStar.wm.2686sec.dot
+++ b/a4/tcp/results/learnedModel.partial.RS.wm.384sec.dot
@@ -5,32 +5,18 @@ __start0 [label="" shape="none"];
        s1 [shape="circle" label="1"];
        s2 [shape="circle" label="2"];
        s3 [shape="circle" label="3"];
-       s4 [shape="circle" label="4"];
        s0 -> s1 [label="SYN / SYN-ACK"];
        s0 -> s2 [label="ACK / ERR"];
        s0 -> s2 [label="DAT / ERR"];
-       s0 -> s2 [label="RST / ERR"];
-       s0 -> s2 [label="FIN / ERR"];
        s1 -> s2 [label="SYN / ERR"];
        s1 -> s2 [label="ACK / ERR"];
        s1 -> s3 [label="DAT / ACK"];
-       s1 -> s0 [label="RST / Reset"];
-       s1 -> s4 [label="FIN / ACK"];
        s2 -> s2 [label="SYN / ERR"];
        s2 -> s2 [label="ACK / ERR"];
        s2 -> s2 [label="DAT / ERR"];
-       s2 -> s2 [label="RST / ERR"];
-       s2 -> s2 [label="FIN / ERR"];
        s3 -> s2 [label="SYN / ERR"];
        s3 -> s2 [label="ACK / ERR"];
        s3 -> s3 [label="DAT / DATA"];
-       s3 -> s0 [label="RST / Reset"];
-       s3 -> s4 [label="FIN / ACK"];
-       s4 -> s4 [label="SYN / Closed"];
-       s4 -> s4 [label="ACK / Closed"];
-       s4 -> s4 [label="DAT / Closed"];
-       s4 -> s4 [label="RST / Closed"];
-       s4 -> s4 [label="FIN / Closed"];
 
 __start0 -> s0;
 }

diff --git a/a4/tcp/results/learnedModel.small.KV.wpm.32sec.dot b/a4/tcp/results/learnedModel.small.LStar.rand.12sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.small.KV.wpm.32sec.dot
rename to a4/tcp/results/learnedModel.small.LStar.rand.12sec.dot

diff --git a/a4/tcp/results/learnedModel.small.LStar.rand.8sec.dot b/a4/tcp/results/learnedModel.small.LStar.rand.8sec.dot
deleted file mode 100644 (file)
index aa691bf..0000000
--- a/a4/tcp/results/learnedModel.small.LStar.rand.8sec.dot
+++ /dev/null
@@ -1,12 +0,0 @@
-digraph g {
-__start0 [label="" shape="none"];
-
-       s0 [shape="circle" label="0"];
-       s1 [shape="circle" label="1"];
-       s0 -> s1 [label="SYN / SYN-ACK"];
-       s0 -> s1 [label="ACK / ERR"];
-       s1 -> s1 [label="SYN / ERR"];
-       s1 -> s1 [label="ACK / ERR"];
-
-__start0 -> s0;
-}

diff --git a/a4/tcp/results/learnedModel.small.LStar.rand.9sec.dot b/a4/tcp/results/learnedModel.small.LStar.rand.9sec.dot
deleted file mode 100644 (file)
index aa691bf..0000000
--- a/a4/tcp/results/learnedModel.small.LStar.rand.9sec.dot
+++ /dev/null
@@ -1,12 +0,0 @@
-digraph g {
-__start0 [label="" shape="none"];
-
-       s0 [shape="circle" label="0"];
-       s1 [shape="circle" label="1"];
-       s0 -> s1 [label="SYN / SYN-ACK"];
-       s0 -> s1 [label="ACK / ERR"];
-       s1 -> s1 [label="SYN / ERR"];
-       s1 -> s1 [label="ACK / ERR"];
-
-__start0 -> s0;
-}

diff --git a/a4/tcp/results/learnedModel.small.LStar.wpm.35sec.dot b/a4/tcp/results/learnedModel.small.LStar.wpm.35sec.dot
deleted file mode 100644 (file)
index aa691bf..0000000
--- a/a4/tcp/results/learnedModel.small.LStar.wpm.35sec.dot
+++ /dev/null
@@ -1,12 +0,0 @@
-digraph g {
-__start0 [label="" shape="none"];
-
-       s0 [shape="circle" label="0"];
-       s1 [shape="circle" label="1"];
-       s0 -> s1 [label="SYN / SYN-ACK"];
-       s0 -> s1 [label="ACK / ERR"];
-       s1 -> s1 [label="SYN / ERR"];
-       s1 -> s1 [label="ACK / ERR"];
-
-__start0 -> s0;
-}

diff --git a/a4/tcp/results/learnedModel.small.RS.wpm.33sec.dot b/a4/tcp/results/learnedModel.small.RS.wpm.33sec.dot
deleted file mode 100644 (file)
index aa691bf..0000000
--- a/a4/tcp/results/learnedModel.small.RS.wpm.33sec.dot
+++ /dev/null
@@ -1,12 +0,0 @@
-digraph g {
-__start0 [label="" shape="none"];
-
-       s0 [shape="circle" label="0"];
-       s1 [shape="circle" label="1"];
-       s0 -> s1 [label="SYN / SYN-ACK"];
-       s0 -> s1 [label="ACK / ERR"];
-       s1 -> s1 [label="SYN / ERR"];
-       s1 -> s1 [label="ACK / ERR"];
-
-__start0 -> s0;
-}

diff --git a/a4/tcp/results/learnedModel.small.TTT.wm.33sec.dot b/a4/tcp/results/learnedModel.small.TTT.wm.32sec.dot
similarity index 100%
rename from a4/tcp/results/learnedModel.small.TTT.wm.33sec.dot
rename to a4/tcp/results/learnedModel.small.TTT.wm.32sec.dot

diff --git a/a4/tcp/results/learnedModel.small.TTT.wpm.33sec.dot b/a4/tcp/results/learnedModel.small.TTT.wpm.33sec.dot
deleted file mode 100644 (file)
index 568e7a2..0000000
--- a/a4/tcp/results/learnedModel.small.TTT.wpm.33sec.dot
+++ /dev/null
@@ -1,12 +0,0 @@
-digraph g {
-__start0 [label="" shape="none"];
-
-       s0 [shape="circle" label="s0"];
-       s1 [shape="circle" label="s1"];
-       s0 -> s1 [label="SYN / SYN-ACK"];
-       s0 -> s1 [label="ACK / ERR"];
-       s1 -> s1 [label="SYN / ERR"];
-       s1 -> s1 [label="ACK / ERR"];
-
-__start0 -> s0;
-}

diff --git a/a4/tcp/results/van_learnlib_naar_dot.py b/a4/tcp/results/van_learnlib_naar_dot.py
deleted file mode 100755 (executable)
index 86d5e7f..0000000
--- a/a4/tcp/results/van_learnlib_naar_dot.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python2
-
-import sys
-import re
-
-sys.stderr.write("""Usage: {} [INPUT [OUTPUT]
-als input/output niet specificeerd pakt hij stdin/stdout
-voorbeeld:
-\t$ < file.dot ./van_learnlib_naar_dot.py | dot -Tpdf > file.pdf
-""".format(sys.argv[0]))
-
-if len(sys.argv) == 1:
-    inputfile = sys.stdin
-    outputfile = sys.stdout
-elif len(sys.argv) == 2:
-    inputfile = open(sys.argv[1], 'r')
-    outputfile = sys.stdout
-else:
-    inputfile = open(sys.argv[1], 'r')
-    outputfile = open(sys.argv[2], 'w')
-
-data = []
-pat = r's(?P<f>\d+) -> s(?P<t>\d+) \[label="(?P<i>\S+) / (?P<o>\S+)"\];'
-
-for line in inputfile:
-    match = re.search(pat, line)
-    if match:
-        outputfile.write('\ts{0} -> s{0}_ [label="!{1}"]\n'.format(
-            match.group('f'), match.group('i')))
-        outputfile.write('\ts{}_ -> s{} [label="?{}"]\n'.format(
-            match.group('f'), match.group('t'), match.group('o')))
-    else:
-        outputfile.write(line)
-
-if inputfile != sys.stdin:
-    inputfile.close()
-if outputfile != sys.stdout:
-    outputfile.close()