diff --git a/NEWS b/NEWS
index b1f7c2d79..0ac838737 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
New in spot 2.11.3.dev (not yet released)
- Nothing yet.
+ Python:
+
+ - spot.acd() no longer depends on jQuery for interactivity.
New in spot 2.11.3 (2022-12-09)
diff --git a/python/spot/__init__.py b/python/spot/__init__.py
index edbf4a4e6..ef4cd772e 100644
--- a/python/spot/__init__.py
+++ b/python/spot/__init__.py
@@ -502,51 +502,57 @@ class acd:
.acdacc polygon{fill:green;}
'''
js = '''
-function acd{num}_clear(){{
- $("#acd{num} .node,#acdaut{num} .node,#acdaut{num} .edge")
- .removeClass("acdhigh acdbold acdacc acdrej");
+function acdremclasses(sel, classes) {{
+document.querySelectorAll(sel).forEach(n=>{{n.classList.remove(...classes)}});}}
+function acdaddclasses(sel, classes) {{
+document.querySelectorAll(sel).forEach(n=>{{n.classList.add(...classes)}});}}
+function acdonclick(sel, fn) {{
+ document.querySelectorAll(sel).forEach(n=>
+ {{n.addEventListener("click", fn)}});
+}}
+function acd{num}_clear() {{
+ acdremclasses("#acd{num} .node,#acdaut{num} .node,#acdaut{num} .edge",
+ ["acdhigh", "acdbold", "acdacc", "acdrej"]);
}};
function acd{num}_state(state){{
- acd{num}_clear();
- $("#acd{num} .acdS" + state).addClass("acdhigh acdbold");
- $("#acdaut{num} #S" + state).addClass("acdbold");
+ acd{num}_clear();
+ acdaddclasses("#acd{num} .acdS" + state, ["acdhigh", "acdbold"]);
+ acdaddclasses("#acdaut{num} #S" + state, ["acdbold"]);
}};
function acd{num}_edge(edge){{
- acd{num}_clear();
- var theedge = $('#acdaut{num} #E' + edge)
- var classList = theedge.attr('class').split(/\s+/);
- $.each(classList, function(index, item) {{
- if (item.startsWith('acdN')) {{
- $("#acd{num} #" + item.substring(3)).addClass("acdhigh acdbold");
- }}
- }});
- theedge.addClass("acdbold");
+ acd{num}_clear();
+ var theedge = document.querySelector('#acdaut{num} #E' + edge);
+ theedge.classList.forEach(function(item, index) {{
+ if (item.startsWith('acdN')) {{
+ acdaddclasses("#acd{num} #" + item.substring(3), ["acdhigh", "acdbold"]);
+ }}
+ }});
+ theedge.classList.add("acdbold");
}};
function acd{num}_node(node, acc){{
acd{num}_clear();
- $("#acdaut{num} .acdN" + node).addClass(acc
- ? "acdacc acdbold"
- : "acdrej acdbold");
- $("#acd{num} #N" + node).addClass("acdbold acdhigh");
+ acdaddclasses("#acdaut{num} .acdN" + node,
+ [acc ? "acdacc" : "acdrej", "acdbold"]);
+ acdaddclasses("#acd{num} #N" + node, ["acdbold", "acdhigh"]);
}};'''.format(num=num)
me = 0
for n in range(self.node_count()):
for e in self.edges_of_node(n):
me = max(e, me)
- js += '$("#acdaut{num} #E{e}").addClass("acdN{n}");'\
+ js += 'acdaddclasses("#acdaut{num} #E{e}", ["acdN{n}"]);\n'\
.format(num=num, e=e, n=n)
for e in range(1, me + 1):
- js += '$("#acdaut{num} #E{e}")'\
- '.click(function(){{acd{num}_edge({e});}});'\
+ js += 'acdonclick("#acdaut{num} #E{e}",'\
+ 'function(){{acd{num}_edge({e});}});\n'\
.format(num=num, e=e)
for s in range(self.get_aut().num_states()):
- js += '$("#acdaut{num} #S{s}")'\
- '.click(function(){{acd{num}_state({s});}});'\
+ js += 'acdonclick("#acdaut{num} #S{s}",'\
+ 'function(){{acd{num}_state({s});}});\n'\
.format(num=num, s=s)
for n in range(self.node_count()):
v = int(self.node_acceptance(n))
- js += '$("#acd{num} #N{n}")'\
- '.click(function(){{acd{num}_node({n}, {v});}});'\
+ js += 'acdonclick("#acd{num} #N{n}",'\
+ 'function(){{acd{num}_node({n}, {v});}});\n'\
.format(num=num, n=n, v=v)
html = '
{}
{}
'\
.format(style,
diff --git a/tests/python/zlktree.ipynb b/tests/python/zlktree.ipynb
index ae44ad37d..c9eb3503d 100644
--- a/tests/python/zlktree.ipynb
+++ b/tests/python/zlktree.ipynb
@@ -216,7 +216,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 2,
@@ -640,7 +640,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14701b7510> >"
+ " *' at 0x7f82c009d7a0> >"
]
},
"execution_count": 10,
@@ -1063,7 +1063,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470220960> >"
+ " *' at 0x7f82c009c630> >"
]
},
"execution_count": 11,
@@ -1256,7 +1256,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14701b75d0> >"
+ " *' at 0x7f82c009c6c0> >"
]
},
"execution_count": 13,
@@ -1701,7 +1701,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470142240> >"
+ " *' at 0x7f82c009c480> >"
]
},
"execution_count": 14,
@@ -2096,7 +2096,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2427,7 +2427,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2513,7 +2513,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2624,7 +2624,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2662,7 +2662,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2700,7 +2700,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"metadata": {},
@@ -2928,7 +2928,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 18,
@@ -4064,36 +4064,159 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut0 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd0 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut0 #E9\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E10\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E11\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E12\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E13\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E14\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E15\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E16\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E21\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E22\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E23\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E24\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E25\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E26\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E27\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E28\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E33\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E34\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E35\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E36\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E31\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E32\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E39\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E40\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E5\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E7\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E17\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E1\", [\"acdN3\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E10\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E12\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E13\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E15\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E21\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E22\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E23\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E24\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E34\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E36\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E14\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E15\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E22\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E23\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E14\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E16\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E26\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E9\", [\"acdN8\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E40\", [\"acdN9\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E5\", [\"acdN10\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E23\", [\"acdN11\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E14\", [\"acdN12\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E23\", [\"acdN13\"]);\n",
+ "acdaddclasses(\"#acdaut0 #E14\", [\"acdN14\"]);\n",
+ "acdonclick(\"#acdaut0 #E1\",function(){acd0_edge(1);});\n",
+ "acdonclick(\"#acdaut0 #E2\",function(){acd0_edge(2);});\n",
+ "acdonclick(\"#acdaut0 #E3\",function(){acd0_edge(3);});\n",
+ "acdonclick(\"#acdaut0 #E4\",function(){acd0_edge(4);});\n",
+ "acdonclick(\"#acdaut0 #E5\",function(){acd0_edge(5);});\n",
+ "acdonclick(\"#acdaut0 #E6\",function(){acd0_edge(6);});\n",
+ "acdonclick(\"#acdaut0 #E7\",function(){acd0_edge(7);});\n",
+ "acdonclick(\"#acdaut0 #E8\",function(){acd0_edge(8);});\n",
+ "acdonclick(\"#acdaut0 #E9\",function(){acd0_edge(9);});\n",
+ "acdonclick(\"#acdaut0 #E10\",function(){acd0_edge(10);});\n",
+ "acdonclick(\"#acdaut0 #E11\",function(){acd0_edge(11);});\n",
+ "acdonclick(\"#acdaut0 #E12\",function(){acd0_edge(12);});\n",
+ "acdonclick(\"#acdaut0 #E13\",function(){acd0_edge(13);});\n",
+ "acdonclick(\"#acdaut0 #E14\",function(){acd0_edge(14);});\n",
+ "acdonclick(\"#acdaut0 #E15\",function(){acd0_edge(15);});\n",
+ "acdonclick(\"#acdaut0 #E16\",function(){acd0_edge(16);});\n",
+ "acdonclick(\"#acdaut0 #E17\",function(){acd0_edge(17);});\n",
+ "acdonclick(\"#acdaut0 #E18\",function(){acd0_edge(18);});\n",
+ "acdonclick(\"#acdaut0 #E19\",function(){acd0_edge(19);});\n",
+ "acdonclick(\"#acdaut0 #E20\",function(){acd0_edge(20);});\n",
+ "acdonclick(\"#acdaut0 #E21\",function(){acd0_edge(21);});\n",
+ "acdonclick(\"#acdaut0 #E22\",function(){acd0_edge(22);});\n",
+ "acdonclick(\"#acdaut0 #E23\",function(){acd0_edge(23);});\n",
+ "acdonclick(\"#acdaut0 #E24\",function(){acd0_edge(24);});\n",
+ "acdonclick(\"#acdaut0 #E25\",function(){acd0_edge(25);});\n",
+ "acdonclick(\"#acdaut0 #E26\",function(){acd0_edge(26);});\n",
+ "acdonclick(\"#acdaut0 #E27\",function(){acd0_edge(27);});\n",
+ "acdonclick(\"#acdaut0 #E28\",function(){acd0_edge(28);});\n",
+ "acdonclick(\"#acdaut0 #E29\",function(){acd0_edge(29);});\n",
+ "acdonclick(\"#acdaut0 #E30\",function(){acd0_edge(30);});\n",
+ "acdonclick(\"#acdaut0 #E31\",function(){acd0_edge(31);});\n",
+ "acdonclick(\"#acdaut0 #E32\",function(){acd0_edge(32);});\n",
+ "acdonclick(\"#acdaut0 #E33\",function(){acd0_edge(33);});\n",
+ "acdonclick(\"#acdaut0 #E34\",function(){acd0_edge(34);});\n",
+ "acdonclick(\"#acdaut0 #E35\",function(){acd0_edge(35);});\n",
+ "acdonclick(\"#acdaut0 #E36\",function(){acd0_edge(36);});\n",
+ "acdonclick(\"#acdaut0 #E37\",function(){acd0_edge(37);});\n",
+ "acdonclick(\"#acdaut0 #E38\",function(){acd0_edge(38);});\n",
+ "acdonclick(\"#acdaut0 #E39\",function(){acd0_edge(39);});\n",
+ "acdonclick(\"#acdaut0 #E40\",function(){acd0_edge(40);});\n",
+ "acdonclick(\"#acdaut0 #S0\",function(){acd0_state(0);});\n",
+ "acdonclick(\"#acdaut0 #S1\",function(){acd0_state(1);});\n",
+ "acdonclick(\"#acdaut0 #S2\",function(){acd0_state(2);});\n",
+ "acdonclick(\"#acdaut0 #S3\",function(){acd0_state(3);});\n",
+ "acdonclick(\"#acdaut0 #S4\",function(){acd0_state(4);});\n",
+ "acdonclick(\"#acdaut0 #S5\",function(){acd0_state(5);});\n",
+ "acdonclick(\"#acdaut0 #S6\",function(){acd0_state(6);});\n",
+ "acdonclick(\"#acdaut0 #S7\",function(){acd0_state(7);});\n",
+ "acdonclick(\"#acdaut0 #S8\",function(){acd0_state(8);});\n",
+ "acdonclick(\"#acdaut0 #S9\",function(){acd0_state(9);});\n",
+ "acdonclick(\"#acd0 #N0\",function(){acd0_node(0, 0);});\n",
+ "acdonclick(\"#acd0 #N1\",function(){acd0_node(1, 1);});\n",
+ "acdonclick(\"#acd0 #N2\",function(){acd0_node(2, 1);});\n",
+ "acdonclick(\"#acd0 #N3\",function(){acd0_node(3, 1);});\n",
+ "acdonclick(\"#acd0 #N4\",function(){acd0_node(4, 1);});\n",
+ "acdonclick(\"#acd0 #N5\",function(){acd0_node(5, 1);});\n",
+ "acdonclick(\"#acd0 #N6\",function(){acd0_node(6, 1);});\n",
+ "acdonclick(\"#acd0 #N7\",function(){acd0_node(7, 1);});\n",
+ "acdonclick(\"#acd0 #N8\",function(){acd0_node(8, 1);});\n",
+ "acdonclick(\"#acd0 #N9\",function(){acd0_node(9, 0);});\n",
+ "acdonclick(\"#acd0 #N10\",function(){acd0_node(10, 0);});\n",
+ "acdonclick(\"#acd0 #N11\",function(){acd0_node(11, 0);});\n",
+ "acdonclick(\"#acd0 #N12\",function(){acd0_node(12, 0);});\n",
+ "acdonclick(\"#acd0 #N13\",function(){acd0_node(13, 0);});\n",
+ "acdonclick(\"#acd0 #N14\",function(){acd0_node(14, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 20,
@@ -4968,7 +5091,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14701670f0> >"
+ " *' at 0x7f82c00bc870> >"
]
},
"execution_count": 29,
@@ -5607,7 +5730,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470167210> >"
+ " *' at 0x7f82c00bc060> >"
]
},
"execution_count": 31,
@@ -5807,7 +5930,9 @@
"cell_type": "code",
"execution_count": 40,
"id": "813d15ed",
- "metadata": {},
+ "metadata": {
+ "scrolled": false
+ },
"outputs": [
{
"data": {
@@ -6875,36 +7000,159 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut1 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd1 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut1 #E9\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E10\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E11\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E12\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E13\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E14\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E15\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E16\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E21\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E22\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E23\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E24\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E25\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E26\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E27\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E28\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E33\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E34\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E35\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E36\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E31\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E32\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E39\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E40\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E5\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E7\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E17\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E1\", [\"acdN3\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E10\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E12\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E13\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E15\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E21\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E22\", [\"acdN4\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E14\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E15\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E22\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E23\", [\"acdN5\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E23\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E24\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E34\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E36\", [\"acdN6\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E14\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E16\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E26\", [\"acdN7\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E9\", [\"acdN8\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E40\", [\"acdN9\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E5\", [\"acdN10\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E14\", [\"acdN11\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E23\", [\"acdN12\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E23\", [\"acdN13\"]);\n",
+ "acdaddclasses(\"#acdaut1 #E14\", [\"acdN14\"]);\n",
+ "acdonclick(\"#acdaut1 #E1\",function(){acd1_edge(1);});\n",
+ "acdonclick(\"#acdaut1 #E2\",function(){acd1_edge(2);});\n",
+ "acdonclick(\"#acdaut1 #E3\",function(){acd1_edge(3);});\n",
+ "acdonclick(\"#acdaut1 #E4\",function(){acd1_edge(4);});\n",
+ "acdonclick(\"#acdaut1 #E5\",function(){acd1_edge(5);});\n",
+ "acdonclick(\"#acdaut1 #E6\",function(){acd1_edge(6);});\n",
+ "acdonclick(\"#acdaut1 #E7\",function(){acd1_edge(7);});\n",
+ "acdonclick(\"#acdaut1 #E8\",function(){acd1_edge(8);});\n",
+ "acdonclick(\"#acdaut1 #E9\",function(){acd1_edge(9);});\n",
+ "acdonclick(\"#acdaut1 #E10\",function(){acd1_edge(10);});\n",
+ "acdonclick(\"#acdaut1 #E11\",function(){acd1_edge(11);});\n",
+ "acdonclick(\"#acdaut1 #E12\",function(){acd1_edge(12);});\n",
+ "acdonclick(\"#acdaut1 #E13\",function(){acd1_edge(13);});\n",
+ "acdonclick(\"#acdaut1 #E14\",function(){acd1_edge(14);});\n",
+ "acdonclick(\"#acdaut1 #E15\",function(){acd1_edge(15);});\n",
+ "acdonclick(\"#acdaut1 #E16\",function(){acd1_edge(16);});\n",
+ "acdonclick(\"#acdaut1 #E17\",function(){acd1_edge(17);});\n",
+ "acdonclick(\"#acdaut1 #E18\",function(){acd1_edge(18);});\n",
+ "acdonclick(\"#acdaut1 #E19\",function(){acd1_edge(19);});\n",
+ "acdonclick(\"#acdaut1 #E20\",function(){acd1_edge(20);});\n",
+ "acdonclick(\"#acdaut1 #E21\",function(){acd1_edge(21);});\n",
+ "acdonclick(\"#acdaut1 #E22\",function(){acd1_edge(22);});\n",
+ "acdonclick(\"#acdaut1 #E23\",function(){acd1_edge(23);});\n",
+ "acdonclick(\"#acdaut1 #E24\",function(){acd1_edge(24);});\n",
+ "acdonclick(\"#acdaut1 #E25\",function(){acd1_edge(25);});\n",
+ "acdonclick(\"#acdaut1 #E26\",function(){acd1_edge(26);});\n",
+ "acdonclick(\"#acdaut1 #E27\",function(){acd1_edge(27);});\n",
+ "acdonclick(\"#acdaut1 #E28\",function(){acd1_edge(28);});\n",
+ "acdonclick(\"#acdaut1 #E29\",function(){acd1_edge(29);});\n",
+ "acdonclick(\"#acdaut1 #E30\",function(){acd1_edge(30);});\n",
+ "acdonclick(\"#acdaut1 #E31\",function(){acd1_edge(31);});\n",
+ "acdonclick(\"#acdaut1 #E32\",function(){acd1_edge(32);});\n",
+ "acdonclick(\"#acdaut1 #E33\",function(){acd1_edge(33);});\n",
+ "acdonclick(\"#acdaut1 #E34\",function(){acd1_edge(34);});\n",
+ "acdonclick(\"#acdaut1 #E35\",function(){acd1_edge(35);});\n",
+ "acdonclick(\"#acdaut1 #E36\",function(){acd1_edge(36);});\n",
+ "acdonclick(\"#acdaut1 #E37\",function(){acd1_edge(37);});\n",
+ "acdonclick(\"#acdaut1 #E38\",function(){acd1_edge(38);});\n",
+ "acdonclick(\"#acdaut1 #E39\",function(){acd1_edge(39);});\n",
+ "acdonclick(\"#acdaut1 #E40\",function(){acd1_edge(40);});\n",
+ "acdonclick(\"#acdaut1 #S0\",function(){acd1_state(0);});\n",
+ "acdonclick(\"#acdaut1 #S1\",function(){acd1_state(1);});\n",
+ "acdonclick(\"#acdaut1 #S2\",function(){acd1_state(2);});\n",
+ "acdonclick(\"#acdaut1 #S3\",function(){acd1_state(3);});\n",
+ "acdonclick(\"#acdaut1 #S4\",function(){acd1_state(4);});\n",
+ "acdonclick(\"#acdaut1 #S5\",function(){acd1_state(5);});\n",
+ "acdonclick(\"#acdaut1 #S6\",function(){acd1_state(6);});\n",
+ "acdonclick(\"#acdaut1 #S7\",function(){acd1_state(7);});\n",
+ "acdonclick(\"#acdaut1 #S8\",function(){acd1_state(8);});\n",
+ "acdonclick(\"#acdaut1 #S9\",function(){acd1_state(9);});\n",
+ "acdonclick(\"#acd1 #N0\",function(){acd1_node(0, 0);});\n",
+ "acdonclick(\"#acd1 #N1\",function(){acd1_node(1, 1);});\n",
+ "acdonclick(\"#acd1 #N2\",function(){acd1_node(2, 1);});\n",
+ "acdonclick(\"#acd1 #N3\",function(){acd1_node(3, 1);});\n",
+ "acdonclick(\"#acd1 #N4\",function(){acd1_node(4, 1);});\n",
+ "acdonclick(\"#acd1 #N5\",function(){acd1_node(5, 1);});\n",
+ "acdonclick(\"#acd1 #N6\",function(){acd1_node(6, 1);});\n",
+ "acdonclick(\"#acd1 #N7\",function(){acd1_node(7, 1);});\n",
+ "acdonclick(\"#acd1 #N8\",function(){acd1_node(8, 1);});\n",
+ "acdonclick(\"#acd1 #N9\",function(){acd1_node(9, 0);});\n",
+ "acdonclick(\"#acd1 #N10\",function(){acd1_node(10, 0);});\n",
+ "acdonclick(\"#acd1 #N11\",function(){acd1_node(11, 0);});\n",
+ "acdonclick(\"#acd1 #N12\",function(){acd1_node(12, 0);});\n",
+ "acdonclick(\"#acd1 #N13\",function(){acd1_node(13, 0);});\n",
+ "acdonclick(\"#acd1 #N14\",function(){acd1_node(14, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 40,
@@ -7817,7 +8065,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14700fe1e0> >"
+ " *' at 0x7f82c00be460> >"
]
},
"execution_count": 45,
@@ -8114,36 +8362,69 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut2 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd2 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut2 #E1\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E2\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E3\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E4\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E5\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E6\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E2\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E3\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E4\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E5\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E6\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E1\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E2\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E4\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut2 #E6\", [\"acdN2\"]);\n",
+ "acdonclick(\"#acdaut2 #E1\",function(){acd2_edge(1);});\n",
+ "acdonclick(\"#acdaut2 #E2\",function(){acd2_edge(2);});\n",
+ "acdonclick(\"#acdaut2 #E3\",function(){acd2_edge(3);});\n",
+ "acdonclick(\"#acdaut2 #E4\",function(){acd2_edge(4);});\n",
+ "acdonclick(\"#acdaut2 #E5\",function(){acd2_edge(5);});\n",
+ "acdonclick(\"#acdaut2 #E6\",function(){acd2_edge(6);});\n",
+ "acdonclick(\"#acdaut2 #S0\",function(){acd2_state(0);});\n",
+ "acdonclick(\"#acdaut2 #S1\",function(){acd2_state(1);});\n",
+ "acdonclick(\"#acdaut2 #S2\",function(){acd2_state(2);});\n",
+ "acdonclick(\"#acd2 #N0\",function(){acd2_node(0, 1);});\n",
+ "acdonclick(\"#acd2 #N1\",function(){acd2_node(1, 0);});\n",
+ "acdonclick(\"#acd2 #N2\",function(){acd2_node(2, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 47,
@@ -8353,7 +8634,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14700feb40> >"
+ " *' at 0x7f82c00bdd40> >"
]
},
"execution_count": 48,
@@ -8628,36 +8909,69 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut3 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd3 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut3 #E1\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E2\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E3\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E4\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E5\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E6\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E1\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E2\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E4\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E6\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E2\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E3\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E4\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E5\", [\"acdN2\"]);\n",
+ "acdaddclasses(\"#acdaut3 #E6\", [\"acdN2\"]);\n",
+ "acdonclick(\"#acdaut3 #E1\",function(){acd3_edge(1);});\n",
+ "acdonclick(\"#acdaut3 #E2\",function(){acd3_edge(2);});\n",
+ "acdonclick(\"#acdaut3 #E3\",function(){acd3_edge(3);});\n",
+ "acdonclick(\"#acdaut3 #E4\",function(){acd3_edge(4);});\n",
+ "acdonclick(\"#acdaut3 #E5\",function(){acd3_edge(5);});\n",
+ "acdonclick(\"#acdaut3 #E6\",function(){acd3_edge(6);});\n",
+ "acdonclick(\"#acdaut3 #S0\",function(){acd3_state(0);});\n",
+ "acdonclick(\"#acdaut3 #S1\",function(){acd3_state(1);});\n",
+ "acdonclick(\"#acdaut3 #S2\",function(){acd3_state(2);});\n",
+ "acdonclick(\"#acd3 #N0\",function(){acd3_node(0, 1);});\n",
+ "acdonclick(\"#acd3 #N1\",function(){acd3_node(1, 0);});\n",
+ "acdonclick(\"#acd3 #N2\",function(){acd3_node(2, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 49,
@@ -8841,7 +9155,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f14700fea80> >"
+ " *' at 0x7f82c00bf300> >"
]
},
"execution_count": 50,
@@ -8993,7 +9307,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470107240> >"
+ " *' at 0x7f82c00be5b0> >"
]
},
"execution_count": 51,
@@ -9105,7 +9419,7 @@
"\n"
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 52,
@@ -9271,7 +9585,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470107030> >"
+ " *' at 0x7f82c00bf5d0> >"
]
},
"execution_count": 53,
@@ -9535,36 +9849,63 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut4 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd4 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut4 #E1\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E2\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E3\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E4\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E5\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E6\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E7\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E8\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut4 #E6\", [\"acdN1\"]);\n",
+ "acdonclick(\"#acdaut4 #E1\",function(){acd4_edge(1);});\n",
+ "acdonclick(\"#acdaut4 #E2\",function(){acd4_edge(2);});\n",
+ "acdonclick(\"#acdaut4 #E3\",function(){acd4_edge(3);});\n",
+ "acdonclick(\"#acdaut4 #E4\",function(){acd4_edge(4);});\n",
+ "acdonclick(\"#acdaut4 #E5\",function(){acd4_edge(5);});\n",
+ "acdonclick(\"#acdaut4 #E6\",function(){acd4_edge(6);});\n",
+ "acdonclick(\"#acdaut4 #E7\",function(){acd4_edge(7);});\n",
+ "acdonclick(\"#acdaut4 #E8\",function(){acd4_edge(8);});\n",
+ "acdonclick(\"#acdaut4 #S0\",function(){acd4_state(0);});\n",
+ "acdonclick(\"#acdaut4 #S1\",function(){acd4_state(1);});\n",
+ "acdonclick(\"#acd4 #N0\",function(){acd4_node(0, 1);});\n",
+ "acdonclick(\"#acd4 #N1\",function(){acd4_node(1, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 55,
@@ -9708,7 +10049,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470107b70> >"
+ " *' at 0x7f82c00f4240> >"
]
},
"execution_count": 57,
@@ -9855,7 +10196,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f147010d240> >"
+ " *' at 0x7f82c00f4090> >"
]
},
"execution_count": 58,
@@ -10165,36 +10506,68 @@
"\n",
"\n",
""
+ " acdaddclasses(\"#acdaut5 .acdN\" + node,\n",
+ " [acc ? \"acdacc\" : \"acdrej\", \"acdbold\"]);\n",
+ " acdaddclasses(\"#acd5 #N\" + node, [\"acdbold\", \"acdhigh\"]);\n",
+ "};acdaddclasses(\"#acdaut5 #E1\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E2\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E3\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E4\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E5\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E6\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E7\", [\"acdN0\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E1\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E3\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E4\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E5\", [\"acdN1\"]);\n",
+ "acdaddclasses(\"#acdaut5 #E7\", [\"acdN2\"]);\n",
+ "acdonclick(\"#acdaut5 #E1\",function(){acd5_edge(1);});\n",
+ "acdonclick(\"#acdaut5 #E2\",function(){acd5_edge(2);});\n",
+ "acdonclick(\"#acdaut5 #E3\",function(){acd5_edge(3);});\n",
+ "acdonclick(\"#acdaut5 #E4\",function(){acd5_edge(4);});\n",
+ "acdonclick(\"#acdaut5 #E5\",function(){acd5_edge(5);});\n",
+ "acdonclick(\"#acdaut5 #E6\",function(){acd5_edge(6);});\n",
+ "acdonclick(\"#acdaut5 #E7\",function(){acd5_edge(7);});\n",
+ "acdonclick(\"#acdaut5 #S0\",function(){acd5_state(0);});\n",
+ "acdonclick(\"#acdaut5 #S1\",function(){acd5_state(1);});\n",
+ "acdonclick(\"#acdaut5 #S2\",function(){acd5_state(2);});\n",
+ "acdonclick(\"#acdaut5 #S3\",function(){acd5_state(3);});\n",
+ "acdonclick(\"#acd5 #N0\",function(){acd5_node(0, 1);});\n",
+ "acdonclick(\"#acd5 #N1\",function(){acd5_node(1, 0);});\n",
+ "acdonclick(\"#acd5 #N2\",function(){acd5_node(2, 0);});\n",
+ ""
],
"text/plain": [
- " >"
+ " >"
]
},
"execution_count": 60,
@@ -10322,7 +10695,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f147010d5a0> >"
+ " *' at 0x7f82c00f50b0> >"
]
},
"execution_count": 61,
@@ -10452,7 +10825,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f147010d6f0> >"
+ " *' at 0x7f82c00f52c0> >"
]
},
"execution_count": 62,
@@ -10732,7 +11105,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470116270> >"
+ " *' at 0x7f82c00f4960> >"
]
},
"execution_count": 63,
@@ -10826,7 +11199,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470116630> >"
+ " *' at 0x7f82c00f5a10> >"
]
},
"execution_count": 64,
@@ -10937,7 +11310,7 @@
"\n"
],
"text/plain": [
- " *' at 0x7f1470116450> >"
+ " *' at 0x7f82c00f5ce0> >"
]
},
"execution_count": 66,
@@ -10995,7 +11368,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.9.2"
+ "version": "3.10.7"
}
},
"nbformat": 4,