[1] The test scenario for 'remove-unfered-conns' was modified.

diff --git a/test/graph.clj b/test/graph.clj
index e8982fa..86bd979 100755 (executable)
--- a/test/graph.clj
+++ b/test/graph.clj
@@ -173,28 +173,38 @@
                   [e-9 [n-8 0] [n-10 0]]
                   ]})))
 
-;
-;(def gr-unrefered-conns1
-;  (struct gr/graph 14
-;    '[ [[]        [in-0 in a]     [e-1] ]
-;       [[]        [in-2 in b]     [e-3] ]
-;       [[]        [in-4 in c]     [e-5] ]
-;       [[e-1 e-3] [and2-6 and2]   [e-7] ]
-;       [[e-5]     [not1-8 not1]   [e-9] ]
-;       [[e-9]     [not1-10 not1]  [e-11]]
-;       [[e-7]     [out-12 out z]  [e-13]] ]))
-;
-;(deftest test-remove-unrefered-conns
-;  (is (= (gr/remove-unrefered-conns gr-unrefered-conns1)
-;         {:next-id 14
-;          :conns '[ [[]        [in-0 in a]    [e-1] ]
-;                    [[]        [in-2 in b]    [e-3] ]
-;                    [[]        [in-4 in c]    [e-5] ]
-;                    [[e-1 e-3] [and2-6 and2]  [e-7] ]
-;                    [[e-7]     [out-12 out z] [e-13]]
-;                    ]}))
-;)
-;
+
+(def gr-unrefered-conns1
+  (struct gr/graph 12
+    '[[n-0 in a]
+      [n-1 in b]
+      [n-2 in c]
+      [n-5 and2]
+      [n-7 not1]
+      [n-9 not1]
+      [n-11 out z]
+      ]
+    '[[e-3 [n-0 0] [n-5 0]]
+      [e-4 [n-1 0] [n-5 1]]
+      [e-6 [n-2 0] [n-7 0]]
+      [e-8 [n-7 0] [n-9 0]]
+      [e-10 [n-5 0] [n-11 0]]
+      ]))
+
+(deftest test-remove-unrefered-conns
+  (is (= (gr/remove-unrefered-conns gr-unrefered-conns1)
+         {:next-id 12
+          :nodes '[[n-0 in a]
+                   [n-1 in b]
+                   [n-2 in c]
+                   [n-5 and2]
+                   [n-11 out z]
+                   ]
+          :edges '[[e-3 [n-0 0] [n-5 0]]
+                   [e-4 [n-1 0] [n-5 1]]
+                   [e-10 [n-5 0] [n-11 0]]
+                   ]})))
+
 ;(deftest test-map
 ;  (let [gr (gr/new-graph)
 ;        [gr a b c] (gr/inputs gr 'a 'b 'c)