funds-cvs

funds-cvs@common-lisp.net

225 discussions

[funds-cvs] r78 - trunk/funds/src/trees
by abaine＠common-lisp.net 11 Jul '07

11 Jul '07

Author: abaine Date: Tue Jul 10 22:46:47 2007 New Revision: 78 Modified: trunk/funds/src/trees/avl.lisp Log: Refactored make-avl-tree calls into attach-avl function. Modified: trunk/funds/src/trees/avl.lisp ============================================================================== --- trunk/funds/src/trees/avl.lisp (original) +++ trunk/funds/src/trees/avl.lisp Tue Jul 10 22:46:47 2007 @@ -37,10 +37,9 @@ (defun balance (inside root outside &key heavy-side) (let ((other-side (other-side heavy-side))) (if (balanced-p inside outside) - (make-avl-tree :key (bt-key root) - :value (bt-value root) - heavy-side outside - other-side inside) + (attach-avl root + heavy-side outside + other-side inside) (rotate inside root (if (heavier-p outside :side other-side) (rotate (tree-child outside :side heavy-side) @@ -52,13 +51,16 @@ (defun rotate (inside root outside &key side) (let* ((t1 (tree-child outside :side side)) - (new-inside (make-avl-tree :key (bt-key root) - :value (bt-value root) - side inside - (other-side side) t1)) + (new-inside (attach-avl root + side inside + (other-side side) t1)) (new-outside (tree-child outside :side (other-side side)))) - (make-avl-tree - :key (bt-key outside) - :value (bt-key outside) - side new-inside - (other-side side) new-outside))) + (attach-avl outside + side new-inside + (other-side side) new-outside))) + +(defun attach-avl (root &key (right (make-avl-tree)) (left (make-avl-tree))) + (make-avl-tree :key (bt-key root) + :value (bt-key root) + :right right + :left left))

1 0

[funds-cvs] r77 - trunk/funds/src/trees
by abaine＠common-lisp.net 11 Jul '07

11 Jul '07

Author: abaine Date: Tue Jul 10 22:45:48 2007 New Revision: 77 Modified: trunk/funds/src/trees/constructors.lisp Log: make-leaf functions now all return singletons. Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Tue Jul 10 22:45:48 2007 @@ -17,11 +17,18 @@ (in-package :funds) +(defconstant +bt-leaf+ (make-instance 'bt-leaf)) +(defconstant +avl-leaf+ (make-instance 'avl-leaf)) +(defconstant +heap-leaf+ (make-instance 'heap-leaf)) + (defun make-bt-leaf () - (make-instance 'bt-leaf)) + +bt-leaf+) (defun make-avl-leaf () - (make-instance 'avl-leaf)) + +avl-leaf+) + +(defun make-heap-leaf () + +heap-leaf+) (defun make-binary-tree () (make-bt-leaf)) @@ -37,8 +44,7 @@ :height (parent-height left right)) (make-avl-leaf))) -(defun make-heap-leaf () - (make-instance 'heap-leaf)) + (defun make-heap (&key (priority 0 p-p) value (left (make-heap-leaf)) (right (make-heap-leaf)))

1 0

[funds-cvs] r76 - trunk/funds/tests/trees
by abaine＠common-lisp.net 11 Jul '07

11 Jul '07

Author: abaine Date: Tue Jul 10 22:19:09 2007 New Revision: 76 Modified: trunk/funds/tests/trees/avl-tree-test.lisp Log: Tests adapted to rewrite. 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 Tue Jul 10 22:19:09 2007 @@ -15,56 +15,56 @@ ;;;; limitations under the License. ;;;; -(in-package :funds.tests.trees) +(in-package :funds-tests) (defun random-tree (&key (test #'eql) (order #'<)) (reduce #'(lambda (tr v) - (avl-insert tr v v :test test :order order)) + (tree-insert tr v v :test test :order order)) (loop for i below 40 collect (random 20)) - :initial-value (empty-avl-tree))) + :initial-value (make-avl-tree))) (defconstant +never-equal+ #'(lambda (a b) (declare (ignore a b)) nil)) (defmacro assert-avl-valid (tree &key (order #'<)) `(progn - (assert-true (height-correct-p ,tree) ,tree) - (assert-true (balanced-p ,tree) ,tree) - (assert-true (ordered-p ,tree :order ,order) ,tree))) - -(define-test test-avl-empty-p - (assert-true (avl-empty-p (empty-avl-tree))) - (assert-avl-valid (empty-avl-tree))) + (assert-true (height-correct-p ,tree) (funds::tree-as-pre-order-alist ,tree)) + (assert-true (balanced-p ,tree) (funds::tree-as-pre-order-alist ,tree)) + (assert-true (ordered-p ,tree :order ,order) (funds::tree-as-pre-order-alist ,tree)))) + +(define-test test-tree-empty-p + (assert-true (tree-empty-p (make-avl-tree))) + (assert-avl-valid (make-avl-tree))) -(define-test test-avl-insert +(define-test test-tree-insert (let ((tree (random-tree))) (assert-avl-valid tree))) (defun height-correct-p (tree) - "Whether (avl-height tree) returns the correct height of the given + "Whether (tree-height tree) returns the correct height of the given AVL Tree. The height is correct if (a) the tree is empty and zero is returned or (b) each of the following is true: 1. the height of the left sub-tree is correct; 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." - (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))) + (or (and (tree-empty-p tree) + (zerop (tree-height tree))) ; (a) + (and (height-correct-p (funds::bt-left tree)) ; (1) + (height-correct-p (funds::bt-right tree)) ; (2) + (let* ((a (tree-height (funds::bt-left tree))) + (b (tree-height (funds::bt-right tree))) (c (if (> a b) a b))) - (eql (1+ c) (avl-height tree)))))) ; (3) + (eql (1+ c) (tree-height tree)))))) ; (3) (defun balanced-p (tree) "Whether the given AVL Tree is properly balanced. To be balanced, the tree must be either (a) empty or (b) have left and right sub-trees that differ in height by no more than 1." - (or (avl-empty-p tree) - (and (balanced-p (avl-left tree)) - (balanced-p (avl-right tree)) - (< -2 (- (avl-height (avl-left tree)) - (avl-height (avl-right tree))) + (or (tree-empty-p tree) + (and (balanced-p (funds::bt-left tree)) + (balanced-p (funds::bt-right tree)) + (< -2 (- (tree-height (funds::bt-left tree)) + (tree-height (funds::bt-right tree))) 2)))) (defun ordered-p (tree &key (order #'<)) @@ -78,24 +78,24 @@ the root key; and 4. every key in the right sub-tree is not less than the root key." - (or (avl-empty-p tree) - (and (ordered-p (avl-left tree)) - (ordered-p (avl-right tree)) - (or (avl-empty-p (avl-left tree)) - (not (funcall order (avl-key tree) - (greatest-key (avl-left tree))))) - (or (avl-empty-p (avl-right tree)) - (not (funcall order (least-key (avl-right tree)) - (avl-key tree))))))) + (or (tree-empty-p tree) + (and (ordered-p (funds::bt-left tree)) + (ordered-p (funds::bt-right tree)) + (or (tree-empty-p (funds::bt-left tree)) + (not (funcall order (funds::bt-key tree) + (greatest-key (funds::bt-left tree))))) + (or (tree-empty-p (funds::bt-right tree)) + (not (funcall order (least-key (funds::bt-right tree)) + (funds::bt-key tree))))))) (defun least-key (tree) "The least key in a properly ordered AVL tree." - (if (avl-empty-p (avl-left tree)) - (avl-key tree) - (least-key (avl-left tree)))) + (if (tree-empty-p (funds::bt-left tree)) + (funds::bt-key tree) + (least-key (funds::bt-left tree)))) (defun greatest-key (tree) "The greatest key in a properly ordered AVL tree." - (if (avl-empty-p (avl-right tree)) - (avl-key tree) - (greatest-key (avl-right tree)))) + (if (tree-empty-p (funds::bt-right tree)) + (funds::bt-key tree) + (greatest-key (funds::bt-right tree))))

1 0

[funds-cvs] r75 - trunk/funds/src/trees
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 17:36:04 2007 New Revision: 75 Modified: trunk/funds/src/trees/avl.lisp trunk/funds/src/trees/bt.lisp Log: Moved some avl-specific functions from bt.lisp to avl.lisp. Modified: trunk/funds/src/trees/avl.lisp ============================================================================== --- trunk/funds/src/trees/avl.lisp (original) +++ trunk/funds/src/trees/avl.lisp Tue Jul 10 17:36:04 2007 @@ -17,6 +17,23 @@ (in-package :funds) + +(defun parent-height (t1 t2) + (let ((h1 (tree-height t1)) + (h2 (tree-height t2))) + (1+ (if (> h1 h2) h1 h2)))) + +(defun height-difference (t1 t2) + (- (tree-height t1) (tree-height t2))) + +(defun heavier-p (tree &key side) + (funcall (if (left-p side) #'plusp #'minusp) + (height-difference (bt-left tree) + (bt-right tree)))) + +(defun balanced-p (t1 t2) + (< -2 (height-difference t1 t2) 2)) + (defun balance (inside root outside &key heavy-side) (let ((other-side (other-side heavy-side))) (if (balanced-p inside outside) Modified: trunk/funds/src/trees/bt.lisp ============================================================================== --- trunk/funds/src/trees/bt.lisp (original) +++ trunk/funds/src/trees/bt.lisp Tue Jul 10 17:36:04 2007 @@ -32,21 +32,3 @@ tree (f (bt-left tree))))) (f (bt-right tree)))) - -(defun parent-height (t1 t2) - (let ((h1 (tree-height t1)) - (h2 (tree-height t2))) - (1+ (if (> h1 h2) h1 h2)))) - -(defun balanced-p (t1 t2) - (< -2 (height-difference t1 t2) 2)) - -(defun height-difference (t1 t2) - (- (tree-height t1) (tree-height t2))) - -(defun heavier-p (tree &key side) - (funcall (if (left-p side) #'plusp #'minusp) - (height-difference (bt-left tree) - (bt-right tree)))) - -

1 0

[funds-cvs] r74 - trunk/funds
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:35:09 2007 New Revision: 74 Modified: trunk/funds/README Log: Fixed typo. Modified: trunk/funds/README ============================================================================== --- trunk/funds/README (original) +++ trunk/funds/README Tue Jul 10 08:35:09 2007 @@ -15,7 +15,7 @@ To load the system, type at a lisp prompt: - > (asdf-operate 'asdf:load-op 'funds) + > (asdf:operate 'asdf:load-op 'funds) To see the publicly exported symbols in package "FUNDS," look at the file funds/src/package.lisp.

1 0

[funds-cvs] r73 - trunk/funds
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:31:40 2007 New Revision: 73 Modified: trunk/funds/README Log: Made README more explicit about linking to funds.asd. Modified: trunk/funds/README ============================================================================== --- trunk/funds/README (original) +++ trunk/funds/README Tue Jul 10 08:31:40 2007 @@ -2,9 +2,20 @@ Funds is designed to be loaded with asdf, available from http://cclan.cvs.sourceforge.net/*checkout*/cclan/asdf/asdf.lisp. +Make a symbolic link to the file funds.asd. On linux, the command +would be something like: + + prompt$ cd /somewhere/in/*central-registry* + prompt$ ln -s /path/to/funds.asd . + +On my machine, that translates to: + + wonder$ cd ~/.sbcl/systems + wonder$ ln -s /home/andrew/sandbox/funds/src/funds.asd . + To load the system, type at a lisp prompt: > (asdf-operate 'asdf:load-op 'funds) To see the publicly exported symbols in package "FUNDS," look at -the file funds/src/package.lisp. \ No newline at end of file +the file funds/src/package.lisp.

1 0

[funds-cvs] r72 - in trunk/funds: src tests
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:19:56 2007 New Revision: 72 Modified: trunk/funds/src/funds.asd trunk/funds/tests/funds-tests.asd Log: Added boilerplate to .asd files. Modified: trunk/funds/src/funds.asd ============================================================================== --- trunk/funds/src/funds.asd (original) +++ trunk/funds/src/funds.asd Tue Jul 10 08:19:56 2007 @@ -1,5 +1,20 @@ -; -*- Lisp -*- +;;;; -*- Lisp -*- +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; (in-package :cl-user) Modified: trunk/funds/tests/funds-tests.asd ============================================================================== --- trunk/funds/tests/funds-tests.asd (original) +++ trunk/funds/tests/funds-tests.asd Tue Jul 10 08:19:56 2007 @@ -1,5 +1,20 @@ ;;;; -*- Lisp -*- +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; (in-package :cl-user)

1 0

[funds-cvs] r71 - in trunk/funds: src src/trees src/trees/heap tests tests/trees
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:14:29 2007 New Revision: 71 Modified: trunk/funds/src/package.lisp trunk/funds/src/queue.lisp trunk/funds/src/stack.lisp trunk/funds/src/trees/avl.lisp trunk/funds/src/trees/bt.lisp trunk/funds/src/trees/classes.lisp trunk/funds/src/trees/constructors.lisp trunk/funds/src/trees/heap/heap-empty-p.lisp trunk/funds/src/trees/heap/heap-first.lisp trunk/funds/src/trees/heap/heap-insert.lisp trunk/funds/src/trees/heap/heap-remove.lisp trunk/funds/src/trees/tree-as-alist.lisp trunk/funds/src/trees/tree-empty-p.lisp trunk/funds/src/trees/tree-find.lisp trunk/funds/src/trees/tree-height.lisp trunk/funds/src/trees/tree-insert.lisp trunk/funds/src/trees/tree-remove.lisp trunk/funds/src/trees/tree-weight.lisp trunk/funds/tests/package.lisp trunk/funds/tests/trees/avl-tree-test.lisp Log: Added boilerplate to .lisp files. Modified: trunk/funds/src/package.lisp ============================================================================== --- trunk/funds/src/package.lisp (original) +++ trunk/funds/src/package.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :cl-user) (defpackage :funds Modified: trunk/funds/src/queue.lisp ============================================================================== --- trunk/funds/src/queue.lisp (original) +++ trunk/funds/src/queue.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defstruct queue Modified: trunk/funds/src/stack.lisp ============================================================================== --- trunk/funds/src/stack.lisp (original) +++ trunk/funds/src/stack.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun make-stack () Modified: trunk/funds/src/trees/avl.lisp ============================================================================== --- trunk/funds/src/trees/avl.lisp (original) +++ trunk/funds/src/trees/avl.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun balance (inside root outside &key heavy-side) Modified: trunk/funds/src/trees/bt.lisp ============================================================================== --- trunk/funds/src/trees/bt.lisp (original) +++ trunk/funds/src/trees/bt.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun left-p (side) Modified: trunk/funds/src/trees/classes.lisp ============================================================================== --- trunk/funds/src/trees/classes.lisp (original) +++ trunk/funds/src/trees/classes.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defclass tree () Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun make-bt-leaf () Modified: trunk/funds/src/trees/heap/heap-empty-p.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-empty-p.lisp (original) +++ trunk/funds/src/trees/heap/heap-empty-p.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun heap-empty-p (heap) Modified: trunk/funds/src/trees/heap/heap-first.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-first.lisp (original) +++ trunk/funds/src/trees/heap/heap-first.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defun heap-first (heap) Modified: trunk/funds/src/trees/heap/heap-insert.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-insert.lisp (original) +++ trunk/funds/src/trees/heap/heap-insert.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric heap-insert (heap value priority &key order)) Modified: trunk/funds/src/trees/heap/heap-remove.lisp ============================================================================== --- trunk/funds/src/trees/heap/heap-remove.lisp (original) +++ trunk/funds/src/trees/heap/heap-remove.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defmethod heap-remove ((heap heap-leaf) &key order) Modified: trunk/funds/src/trees/tree-as-alist.lisp ============================================================================== --- trunk/funds/src/trees/tree-as-alist.lisp (original) +++ trunk/funds/src/trees/tree-as-alist.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-as-alist (tree) Modified: trunk/funds/src/trees/tree-empty-p.lisp ============================================================================== --- trunk/funds/src/trees/tree-empty-p.lisp (original) +++ trunk/funds/src/trees/tree-empty-p.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-empty-p (tree) Modified: trunk/funds/src/trees/tree-find.lisp ============================================================================== --- trunk/funds/src/trees/tree-find.lisp (original) +++ trunk/funds/src/trees/tree-find.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-find (tree key &key test order) Modified: trunk/funds/src/trees/tree-height.lisp ============================================================================== --- trunk/funds/src/trees/tree-height.lisp (original) +++ trunk/funds/src/trees/tree-height.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-height (tree) Modified: trunk/funds/src/trees/tree-insert.lisp ============================================================================== --- trunk/funds/src/trees/tree-insert.lisp (original) +++ trunk/funds/src/trees/tree-insert.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-insert (tree key value &key test order) Modified: trunk/funds/src/trees/tree-remove.lisp ============================================================================== --- trunk/funds/src/trees/tree-remove.lisp (original) +++ trunk/funds/src/trees/tree-remove.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-remove (tree key &key test order) Modified: trunk/funds/src/trees/tree-weight.lisp ============================================================================== --- trunk/funds/src/trees/tree-weight.lisp (original) +++ trunk/funds/src/trees/tree-weight.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds) (defgeneric tree-weight (tree) Modified: trunk/funds/tests/package.lisp ============================================================================== --- trunk/funds/tests/package.lisp (original) +++ trunk/funds/tests/package.lisp Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :cl-user) (defpackage funds-tests 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 Tue Jul 10 08:14:29 2007 @@ -1,4 +1,20 @@ +;;;; +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;; + (in-package :funds.tests.trees) (defun random-tree (&key (test #'eql) (order #'<))

1 0

[funds-cvs] r70 - trunk/funds
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:09:23 2007 New Revision: 70 Modified: trunk/funds/license.txt Log: Fixed typo in license. Modified: trunk/funds/license.txt ============================================================================== --- trunk/funds/license.txt (original) +++ trunk/funds/license.txt Tue Jul 10 08:09:23 2007 @@ -1,14 +1,16 @@ -;;;; Copyright 2007 Andrew Baine ;;;; -;;;; Licensed under the Apache License, Version 2.0 (the "License"); you -;;;; may not use this file except in compliance with the License. You may -;;;; obtain a copy of the License at -;;;; -;;;; http://www.apache.org/licenses/LICENSE-2.0 Unless required by -;;;; -;;;; applicable law or agreed to in writing, software distributed under the -;;;; License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -;;;; CONDITIONS OF ANY KIND, either express or implied. See the License for -;;;; the specific language governing permissions and limitations under the -;;;; License. +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); +;;;; you may not use this file except in compliance with the License. +;;;; You may obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 +;;;; +;;;; Unless required by applicable law or agreed to in writing, software +;;;; distributed under the License is distributed on an "AS IS" BASIS, +;;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +;;;; See the License for the specific language governing permissions and +;;;; limitations under the License. +;;;;

1 0

[funds-cvs] r69 - trunk/funds
by abaine＠common-lisp.net 10 Jul '07

10 Jul '07

Author: abaine Date: Tue Jul 10 08:00:38 2007 New Revision: 69 Modified: trunk/funds/license.txt Log: Apache license boilerplate added. Modified: trunk/funds/license.txt ============================================================================== --- trunk/funds/license.txt (original) +++ trunk/funds/license.txt Tue Jul 10 08:00:38 2007 @@ -1,22 +1,14 @@ -The MIT License - -Copyright (c) 2007 Andrew Baine <andrew.baine(a)gmail.com> - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +;;;; Copyright 2007 Andrew Baine +;;;; +;;;; Licensed under the Apache License, Version 2.0 (the "License"); you +;;;; may not use this file except in compliance with the License. You may +;;;; obtain a copy of the License at +;;;; +;;;; http://www.apache.org/licenses/LICENSE-2.0 Unless required by +;;;; +;;;; applicable law or agreed to in writing, software distributed under the +;;;; License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +;;;; CONDITIONS OF ANY KIND, either express or implied. See the License for +;;;; the specific language governing permissions and limitations under the +;;;; License.

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

funds-cvs