funds-cvs

funds-cvs@common-lisp.net

225 discussions

[funds-cvs] r28 - trunk/funds/src/trees
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 12:27:20 2007 New Revision: 28 Modified: trunk/funds/src/trees/avl-tree.lisp Log: Changed avl-insert signature to accept keyword arguments test and order Modified: trunk/funds/src/trees/avl-tree.lisp ============================================================================== --- trunk/funds/src/trees/avl-tree.lisp (original) +++ trunk/funds/src/trees/avl-tree.lisp Wed Jun 20 12:27:20 2007 @@ -17,13 +17,19 @@ t if it is empty; nil else." (null tree)) -(defun avl-insert (tree key value) +(defun avl-insert (tree key value &key (test #'eql) (order #'<)) (cond ((avl-empty-p tree) (make-avl :ht 1 :key key :value value - :left nil - :right nil)) - ((< key (avl-key tree)) (left-insert tree key value)) + :left (empty-avl-tree) + :right (empty-avl-tree))) + + ((funcall test key (avl-key tree)) (make-avl :ht (avl-ht tree) + :key key + :value value + :left (avl-left tree) + :right (avl-right tree))) + ((funcall order key (avl-key tree)) (left-insert tree key value)) (t (right-insert tree key value)))) (defun left-insert (tree key value)

1 0

[funds-cvs] r27 - trunk/funds/tests/trees
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 12:15:00 2007 New Revision: 27 Modified: trunk/funds/tests/trees/avl-tree-test.lisp Log: Changed a couple of comments. Modified: trunk/funds/tests/trees/avl-tree-test.lisp ============================================================================== --- trunk/funds/tests/trees/avl-tree-test.lisp (original) +++ trunk/funds/tests/trees/avl-tree-test.lisp Wed Jun 20 12:15:00 2007 @@ -29,14 +29,14 @@ 2. the height of the right sub-tree is correct; 3. the height of the given tree is 1 more than the greater of the heights of the left and right sub-trees." - (if (avl-empty-p tree) - (zerop (avl-height tree)) - (and (height-correct-p (avl-left tree)) - (height-correct-p (avl-right tree)) + (or (and (avl-empty-p tree) + (zerop (avl-height tree))) ; (a) + (and (height-correct-p (avl-left tree)) ; (1) + (height-correct-p (avl-right tree)) ; (2) (let* ((a (avl-height (avl-left tree))) (b (avl-height (avl-right tree))) (c (if (> a b) a b))) - (eql (1+ c) (avl-height tree)))))) + (eql (1+ c) (avl-height tree)))))) ; (3) (defun balanced-p (tree) "Whether the given AVL Tree is properly balanced. To be balanced,

1 0

[funds-cvs] r26 - trunk/funds/tests
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 12:14:34 2007 New Revision: 26 Modified: trunk/funds/tests/funds-tests.asd Log: Added funds dependency. Modified: trunk/funds/tests/funds-tests.asd ============================================================================== --- trunk/funds/tests/funds-tests.asd (original) +++ trunk/funds/tests/funds-tests.asd Wed Jun 20 12:14:34 2007 @@ -14,4 +14,5 @@ :serial t :components ((:file "package") (:file "avl-tree-test")))) - :depends-on (:lisp-unit)) + :depends-on (:funds + :lisp-unit))

1 0

[funds-cvs] r25 - trunk/funds/tests
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 11:57:32 2007 New Revision: 25 Added: trunk/funds/tests/funds-tests.asd Log: Created new test system and added trees tests. Added: trunk/funds/tests/funds-tests.asd ============================================================================== --- (empty file) +++ trunk/funds/tests/funds-tests.asd Wed Jun 20 11:57:32 2007 @@ -0,0 +1,17 @@ + +;;;; -*- Lisp -*- + +(in-package :cl-user) + +(defpackage #:funds-tests-asd + (:use :cl :asdf)) + +(in-package #:funds-tests-asd) + +(defsystem funds-tests + :serial t + :components ((:module trees + :serial t + :components ((:file "package") + (:file "avl-tree-test")))) + :depends-on (:lisp-unit))

1 0

[funds-cvs] r24 - trunk/funds/src
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 11:56:54 2007 New Revision: 24 Modified: trunk/funds/src/funds.asd Log: Removed test modules from defsystem form. Modified: trunk/funds/src/funds.asd ============================================================================== --- trunk/funds/src/funds.asd (original) +++ trunk/funds/src/funds.asd Wed Jun 20 11:56:54 2007 @@ -13,13 +13,5 @@ :components ((:module trees :serial t :components ((:file "package") - (:file "avl-tree"))) - - (:module tests - :serial t - :components ((:module trees - :serial t - :components ((:file "package") - (:file "avl-tree-test"))))) - (:file "package")) - :depends-on (:lisp-unit)) + (:file "avl-tree"))) + (:file "package")))

1 0

[funds-cvs] r23 - trunk/funds/src/tests
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 11:50:29 2007 New Revision: 23 Removed: trunk/funds/src/tests/ Log: Deleted old tests directory.

1 0

[funds-cvs] r22 - in trunk/funds/tests: . trees
by abaine＠common-lisp.net 20 Jun '07

20 Jun '07

Author: abaine Date: Wed Jun 20 11:45:04 2007 New Revision: 22 Added: trunk/funds/tests/ - copied from r18, trunk/funds/src/tests/ trunk/funds/tests/trees/ - copied from r19, trunk/funds/src/tests/trees/ trunk/funds/tests/trees/avl-tree-test.lisp - copied unchanged from r21, trunk/funds/src/tests/trees/avl-tree-test.lisp trunk/funds/tests/trees/package.lisp - copied unchanged from r21, trunk/funds/src/tests/trees/package.lisp Removed: trunk/funds/tests/avl-tree-test.lisp trunk/funds/tests/package.lisp Log: Moved tests directory to project root

1 0

[funds-cvs] r21 - trunk/funds/src/tests/trees
by abaine＠common-lisp.net 15 Jun '07

15 Jun '07

Author: abaine Date: Fri Jun 15 14:48:45 2007 New Revision: 21 Modified: trunk/funds/src/tests/trees/avl-tree-test.lisp trunk/funds/src/tests/trees/package.lisp Log: Renamed funds-trees-tests to funds.tests.trees Modified: trunk/funds/src/tests/trees/avl-tree-test.lisp ============================================================================== --- trunk/funds/src/tests/trees/avl-tree-test.lisp (original) +++ trunk/funds/src/tests/trees/avl-tree-test.lisp Fri Jun 15 14:48:45 2007 @@ -1,5 +1,5 @@ -(in-package :funds-trees-tests) +(in-package :funds.tests.trees) (defun random-tree () (reduce #'(lambda (tr v) Modified: trunk/funds/src/tests/trees/package.lisp ============================================================================== --- trunk/funds/src/tests/trees/package.lisp (original) +++ trunk/funds/src/tests/trees/package.lisp Fri Jun 15 14:48:45 2007 @@ -1,7 +1,7 @@ (in-package :cl-user) -(defpackage funds-trees-tests +(defpackage funds.tests.trees (:use :cl :funds.trees :lisp-unit))

1 0

[funds-cvs] r20 - trunk/funds/src/tests/trees
by abaine＠common-lisp.net 15 Jun '07

15 Jun '07

Author: abaine Date: Fri Jun 15 14:40:49 2007 New Revision: 20 Modified: trunk/funds/src/tests/trees/package.lisp Log: Fixed package name Modified: trunk/funds/src/tests/trees/package.lisp ============================================================================== --- trunk/funds/src/tests/trees/package.lisp (original) +++ trunk/funds/src/tests/trees/package.lisp Fri Jun 15 14:40:49 2007 @@ -3,5 +3,5 @@ (defpackage funds-trees-tests (:use :cl - :funds-trees + :funds.trees :lisp-unit))

1 0

[funds-cvs] r19 - in trunk/funds/src/tests: . trees
by abaine＠common-lisp.net 15 Jun '07

15 Jun '07

Author: abaine Date: Fri Jun 15 14:38:39 2007 New Revision: 19 Added: trunk/funds/src/tests/trees/ trunk/funds/src/tests/trees/avl-tree-test.lisp - copied unchanged from r18, trunk/funds/src/tests/avl-tree-test.lisp trunk/funds/src/tests/trees/package.lisp - copied unchanged from r18, trunk/funds/src/tests/package.lisp Removed: trunk/funds/src/tests/avl-tree-test.lisp trunk/funds/src/tests/package.lisp Log: Now I think I've really fixed the directory structure?

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

funds-cvs