X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=unit-tests%2Ftest-graph.lisp;h=1a64abc3911d7c29344b88e9bee188f978af8c7d;hb=8e7eb729b124e52b5d5f102545f95ca1bff67c3e;hp=3e36301cce47c6fcf17650f3bf6acd92adcce1d3;hpb=704d2802c057c57704629dcd228ead6c5d3c4258;p=cl-graph.git

diff --git a/unit-tests/test-graph.lisp b/unit-tests/test-graph.lisp
index 3e36301..1a64abc 100644
--- a/unit-tests/test-graph.lisp
+++ b/unit-tests/test-graph.lisp
@@ -16,9 +16,9 @@
 
 (addtest (test-test-vertex)
   test-1
-  (metatilities:bind ((x (float 2.1d0))
-                     (y (float 2.1d0))
-                     (g (make-container 'graph-container)))
+  (let ((x (float 2.1d0))
+	(y (float 2.1d0))
+	(g (make-container 'graph-container)))
     (add-vertex g (+ x y))
     (add-vertex g (+ x y))
     
@@ -26,7 +26,7 @@
 
 (addtest (test-test-vertex)
   test-2
-  (bind ((x (float 2.1d0))
+  (let ((x (float 2.1d0))
          (y (float 2.1d0))
          (g (make-container 'graph-container :vertex-test #'=)))
     (add-vertex g (+ x y))
@@ -40,8 +40,10 @@
 ;;; ---------------------------------------------------------------------------
 
 (deftestsuite test-basic-graph-properties (cl-graph-test)
-  ((graph-undirected (make-container 'graph-container :default-edge-type :undirected))
-   (graph-directed (make-container 'graph-container :default-edge-type :directed)))
+  ((graph-undirected (make-container 'graph-container
+				     :default-edge-type :undirected))
+   (graph-directed (make-container 'graph-container
+				   :default-edge-type :directed)))
   :setup ((loop for v in '(a b c d e) do
                 (add-vertex graph-undirected v)
                 (add-vertex graph-directed v))
@@ -49,6 +51,15 @@
                 (add-edge-between-vertexes graph-undirected v1 v2)
                 (add-edge-between-vertexes graph-directed v1 v2))))
 
+#+(or)
+(let ((g (make-container 'graph-container
+			 :default-edge-type :directed)))
+  (loop for v in '(a b c d e) do
+                (add-vertex g v))
+  (loop for (v1 . v2) in '((a . b) (a . c) (b . d) (c . e)) do
+       (add-edge-between-vertexes g v1 v2))
+  g)
+
 ;;; ---------------------------------------------------------------------------
 
 (addtest (test-basic-graph-properties)