projects
/
cl-graph.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweak website style sheets (thanks to Robert Goldman!)
[cl-graph.git]
/
unit-tests
/
test-graph.lisp
diff --git
a/unit-tests/test-graph.lisp
b/unit-tests/test-graph.lisp
index
a30df12
..
1a64abc
100644
(file)
--- a/
unit-tests/test-graph.lisp
+++ b/
unit-tests/test-graph.lisp
@@
-12,21
+12,21
@@
(deftestsuite cl-graph-test () ())
(deftestsuite cl-graph-test () ())
-(deftestsuite test-test-vertex () ())
+(deftestsuite test-test-vertex (cl-graph-test) ())
(addtest (test-test-vertex)
test-1
(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))
(ensure-same (size g) 2)))
(addtest (test-test-vertex)
(add-vertex g (+ x y))
(add-vertex g (+ x y))
(ensure-same (size g) 2)))
(addtest (test-test-vertex)
- test-1
- (bind ((x (float 2.1d0))
+ test-2
+ (let ((x (float 2.1d0))
(y (float 2.1d0))
(g (make-container 'graph-container :vertex-test #'=)))
(add-vertex g (+ x y))
(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)
;;; ---------------------------------------------------------------------------
(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))
: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))))
(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)
;;; ---------------------------------------------------------------------------
(addtest (test-basic-graph-properties)
@@
-68,7
+79,7
@@
(delete-edge-between-vertexes graph-directed 'a 'b)
(ensure-same (size (graph-edges graph-directed)) 3))
(delete-edge-between-vertexes graph-directed 'a 'b)
(ensure-same (size (graph-edges graph-directed)) 3))
-;;; ---------------------------------------------------------------------------
+#|
(deftestsuite cl-graph-test-traversal (cl-graph-test)
((g (make-container 'graph-container)))
(deftestsuite cl-graph-test-traversal (cl-graph-test)
((g (make-container 'graph-container)))
@@
-77,8
+88,6
@@
(h j)) do
(add-edge-between-vertexes g src dst :edge-type :directed)))
(h j)) do
(add-edge-between-vertexes g src dst :edge-type :directed)))
-;;; ---------------------------------------------------------------------------
-
#|
a - b - e
#|
a - b - e
@@
-97,8
+106,6
@@
a - b - e
(ensure-same (reverse result)
'(e f b c g i j h d a) :test #'equal)))
(ensure-same (reverse result)
'(e f b c g i j h d a) :test #'equal)))
-;;; ---------------------------------------------------------------------------
-
(addtest (cl-graph-test-traversal)
(let ((result nil))
(traverse-elements
(addtest (cl-graph-test-traversal)
(let ((result nil))
(traverse-elements
@@
-107,6
+114,7
@@
a - b - e
(ensure-same (reverse result)
'(a b c d e f g h i j) :test #'equal)))
(ensure-same (reverse result)
'(a b c d e f g h i j) :test #'equal)))
+|#
;;; ---------------------------------------------------------------------------
;;; test-replace-vertex
;;; ---------------------------------------------------------------------------
;;; test-replace-vertex