From 8f9740d2d7d19a89f6095297533ed92c63fbddfe Mon Sep 17 00:00:00 2001 From: Sergiu Ivanov Date: Thu, 26 Nov 2020 22:36:19 +0100 Subject: [PATCH] network: Fix the tests for interaction graphs. --- networks.rkt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/networks.rkt b/networks.rkt index 6c6808d..08ef2f0 100644 --- a/networks.rkt +++ b/networks.rkt @@ -582,7 +582,7 @@ [skip-expensive-tests? (displayln "Skipping test case build-interaction-graph.")] [else - (define n1 (forms->boolean-network + (define n1 (make-boolean-network-form (hash 'x '(not y) 'y 'x 'z '(and y z) @@ -595,7 +595,7 @@ 'z '(- 2 y) 't '(abs (- y 1)))) (define 123-doms (make-same-domains '(x y z t) '(0 1 2))) - (define n2 (network-form->network (network-form n-multi 123-doms))) + (define n2 (network-form n-multi 123-doms)) (check-equal? (graphviz (build-interaction-graph/form n2)) "digraph G {\n\tnode0 [label=\"y\"];\n\tnode1 [label=\"z\"];\n\tnode2 [label=\"x\"];\n\tnode3 [label=\"t\"];\n\tsubgraph U {\n\t\tedge [dir=none];\n\t\tnode0 -> node0;\n\t}\n\tsubgraph D {\n\t\tnode0 -> node2;\n\t\tnode0 -> node3;\n\t\tnode0 -> node1;\n\t}\n}\n")]))) @@ -623,7 +623,7 @@ [skip-expensive-tests? (displayln "Skipping test case build-signed-interaction-graph.")] [else - (define n1 (forms->boolean-network + (define n1 (make-boolean-network-form (hash 'x '(not y) 'y 'x 'z '(and y z) @@ -636,7 +636,7 @@ 'z '(- 2 y) 't '(abs (- y 1)))) (define 123-doms (make-same-domains '(x y z t) '(0 1 2))) - (define n2 (network-form->network (network-form n-multi 123-doms))) + (define n2 (network-form n-multi 123-doms)) (check-equal? (graphviz (build-signed-interaction-graph/form n2)) "digraph G {\n\tnode0 [label=\"y\"];\n\tnode1 [label=\"z\"];\n\tnode2 [label=\"x\"];\n\tnode3 [label=\"t\"];\n\tsubgraph U {\n\t\tedge [dir=none];\n\t\tnode0 -> node0 [label=\"1\"];\n\t}\n\tsubgraph D {\n\t\tnode0 -> node2 [label=\"1\"];\n\t\tnode0 -> node3 [label=\"0\"];\n\t\tnode0 -> node1 [label=\"-1\"];\n\t}\n}\n")])))