funds-cvs

funds-cvs@common-lisp.net

225 discussions

[funds-cvs] r158 - trunk/funds/src/trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 12:14:01 2007 New Revision: 158 Modified: trunk/funds/src/trees/tree-insert.lisp Log: Edited documentation of tree-insert. Modified: trunk/funds/src/trees/tree-insert.lisp ============================================================================== --- trunk/funds/src/trees/tree-insert.lisp (original) +++ trunk/funds/src/trees/tree-insert.lisp Sun Aug 19 12:14:01 2007 @@ -19,11 +19,12 @@ (defgeneric tree-insert (tree key value &key test order) (:documentation -"A new tree similar to the given tree except that the given key and value -are now associated with one another. If the given key is already contained -in the tree, according to the test function, then the old value is replaced -by the specified value. The order function specifies whether the given -key-value pair should be inserted to the left or right of the given tree.")) + "A new tree similar to the given tree except that the given key and +value are now associated with one another. If the given key is already +contained in the tree, according to the test function, then the old value +is replaced by the specified value in the returned tree. The order function +specifies whether the given key-value pair should be inserted to the left or +right of the given tree. The given tree is not modified.")) (defmethod tree-insert ((tree bt-leaf) key value &key test order) (declare (ignore test order))

1 0

[funds-cvs] r157 - trunk/funds/src/trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 12:09:48 2007 New Revision: 157 Modified: trunk/funds/src/trees/constructors.lisp Log: Added documentation to make-binary-tree and make-avl-tree. Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Sun Aug 19 12:09:48 2007 @@ -27,8 +27,10 @@ +avl-leaf+) (defun make-binary-tree () + "An empty binary tree." (make-bt-leaf)) (defun make-avl-tree () + "An empty AVL tree." (make-avl-leaf))

1 0

[funds-cvs] r156 - in trunk/funds/src: heap trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 12:07:15 2007 New Revision: 156 Modified: trunk/funds/src/heap/heap.lisp trunk/funds/src/trees/tree-weight.lisp Log: Moved heap functions to heap folder. Modified: trunk/funds/src/heap/heap.lisp ============================================================================== --- trunk/funds/src/heap/heap.lisp (original) +++ trunk/funds/src/heap/heap.lisp Sun Aug 19 12:07:15 2007 @@ -5,7 +5,7 @@ () (:documentation "A leaf node of a heap.")) -(defconstant +heap-leaf+ (make-instance 'heap-leaf)) +(defvar +heap-leaf+ (make-instance 'heap-leaf)) (defun make-heap-leaf () +heap-leaf+) @@ -32,3 +32,6 @@ :value (bt-value root) :left left :right right)) + +(defmethod tree-weight ((tree heap)) + (heap-weight tree)) Modified: trunk/funds/src/trees/tree-weight.lisp ============================================================================== --- trunk/funds/src/trees/tree-weight.lisp (original) +++ trunk/funds/src/trees/tree-weight.lisp Sun Aug 19 12:07:15 2007 @@ -28,5 +28,3 @@ (+ 1 (tree-weight (bt-left tree)) (tree-weight (bt-right tree)))) -(defmethod tree-weight ((tree heap)) - (heap-weight tree))

1 0

[funds-cvs] r155 - in trunk/funds/src: heap trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:53:04 2007 New Revision: 155 Modified: trunk/funds/src/heap/heap.lisp trunk/funds/src/trees/constructors.lisp Log: Moved +heap-leaf+ and make-heap-leaf from constructors.lisp to heap.lisp. Modified: trunk/funds/src/heap/heap.lisp ============================================================================== --- trunk/funds/src/heap/heap.lisp (original) +++ trunk/funds/src/heap/heap.lisp Sun Aug 19 11:53:04 2007 @@ -5,6 +5,11 @@ () (:documentation "A leaf node of a heap.")) +(defconstant +heap-leaf+ (make-instance 'heap-leaf)) + +(defun make-heap-leaf () + +heap-leaf+) + (defclass heap (binary-tree) ((key :initarg :priority :reader heap-priority) (left :initform (make-heap)) Modified: trunk/funds/src/trees/constructors.lisp ============================================================================== --- trunk/funds/src/trees/constructors.lisp (original) +++ trunk/funds/src/trees/constructors.lisp Sun Aug 19 11:53:04 2007 @@ -19,7 +19,6 @@ (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 () +bt-leaf+) @@ -27,9 +26,6 @@ (defun make-avl-leaf () +avl-leaf+) -(defun make-heap-leaf () - +heap-leaf+) - (defun make-binary-tree () (make-bt-leaf))

1 0

[funds-cvs] r154 - trunk/funds/src/trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:50:29 2007 New Revision: 154 Modified: trunk/funds/src/trees/tree-insert.lisp Log: superficiale Modified: trunk/funds/src/trees/tree-insert.lisp ============================================================================== --- trunk/funds/src/trees/tree-insert.lisp (original) +++ trunk/funds/src/trees/tree-insert.lisp Sun Aug 19 11:50:29 2007 @@ -33,7 +33,6 @@ (declare (ignore test order)) (stitch-avl-tree :key key :value value)) - (defmethod tree-insert (tree key value &key (test #'eql) (order #'<)) (if (funcall test key (bt-key tree)) (stitch-tree tree :key key :value value :left (bt-left tree) :right (bt-right tree))

1 0

[funds-cvs] r153 - in trunk/funds/src: heap trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:37:55 2007 New Revision: 153 Modified: trunk/funds/src/heap/heap.lisp trunk/funds/src/trees/classes.lisp Log: Moved heap classes from trees/classes.lisp to heap/heap.lisp. Modified: trunk/funds/src/heap/heap.lisp ============================================================================== --- trunk/funds/src/heap/heap.lisp (original) +++ trunk/funds/src/heap/heap.lisp Sun Aug 19 11:37:55 2007 @@ -1,6 +1,16 @@ (in-package :funds) +(defclass heap-leaf (leaf) + () + (:documentation "A leaf node of a heap.")) + +(defclass heap (binary-tree) + ((key :initarg :priority :reader heap-priority) + (left :initform (make-heap)) + (right :initform (make-heap)) + (weight :initarg :weight :initform 1 :reader heap-weight))) + (defun make-heap (&key (priority 0 p-p) value (left (make-heap-leaf)) (right (make-heap-leaf))) (if p-p Modified: trunk/funds/src/trees/classes.lisp ============================================================================== --- trunk/funds/src/trees/classes.lisp (original) +++ trunk/funds/src/trees/classes.lisp Sun Aug 19 11:37:55 2007 @@ -45,13 +45,3 @@ (left :initform (make-avl-tree)) (right :initform (make-avl-tree))) (:documentation "A height-balanced binary tree.")) - -(defclass heap-leaf (leaf) - () - (:documentation "A leaf node of a heap.")) - -(defclass heap (binary-tree) - ((key :initarg :priority :reader heap-priority) - (left :initform (make-heap)) - (right :initform (make-heap)) - (weight :initarg :weight :initform 1 :reader heap-weight)))

1 0

[funds-cvs] r152 - trunk/funds/src/trees
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:30:24 2007 New Revision: 152 Modified: trunk/funds/src/trees/classes.lisp Log: Cosmetic changes. Modified: trunk/funds/src/trees/classes.lisp ============================================================================== --- trunk/funds/src/trees/classes.lisp (original) +++ trunk/funds/src/trees/classes.lisp Sun Aug 19 11:30:24 2007 @@ -55,7 +55,3 @@ (left :initform (make-heap)) (right :initform (make-heap)) (weight :initarg :weight :initform 1 :reader heap-weight))) - - - -

1 0

[funds-cvs] r151 - trunk/funds/src
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:28:00 2007 New Revision: 151 Modified: trunk/funds/src/funds.asd Log: Moved heap module in defsystem. Modified: trunk/funds/src/funds.asd ============================================================================== --- trunk/funds/src/funds.asd (original) +++ trunk/funds/src/funds.asd Sun Aug 19 11:28:00 2007 @@ -40,14 +40,14 @@ (:file "tree-remove") (:file "tree-find") (:file "tree-weight") - (:file "tree-height") - (:module heap - :serial t - :components ((:file "heap") - (:file "heap-empty-p") - (:file "heap-insert") - (:file "heap-remove") - (:file "heap-first"))))) + (:file "tree-height"))) + (:module heap + :serial t + :components ((:file "heap") + (:file "heap-empty-p") + (:file "heap-insert") + (:file "heap-remove") + (:file "heap-first"))) (:file "f-array") (:file "dictionary") (:file "queue")))

1 0

[funds-cvs] r150 - in trunk/funds/src: heap trees/heap
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:25:39 2007 New Revision: 150 Added: trunk/funds/src/heap/ - copied from r149, trunk/funds/src/trees/heap/ Removed: trunk/funds/src/trees/heap/ Log: Moved heap to top directory.

1 0

[funds-cvs] r149 - trunk/funds/src/examples
by abaine＠common-lisp.net 19 Aug '07

19 Aug '07

Author: abaine Date: Sun Aug 19 11:07:40 2007 New Revision: 149 Modified: trunk/funds/src/examples/sudoku.lisp Log: Renamed solve do puzzle-solve and added (solve list). Modified: trunk/funds/src/examples/sudoku.lisp ============================================================================== --- trunk/funds/src/examples/sudoku.lisp (original) +++ trunk/funds/src/examples/sudoku.lisp Sun Aug 19 11:07:40 2007 @@ -4,6 +4,9 @@ (defconstant +false+ 0) (defconstant +true+ 1) +(defun solve (list) + (list-from-puzzle (puzzle-solve (puzzle-from-list list)))) + (defstruct puzzle size tree) @@ -125,7 +128,7 @@ (collect (or (puzzle-elt puzzle i j k) ""))))))))) -(defun solve (puzzle) +(defun puzzle-solve (puzzle) (if (puzzle-solvable-p puzzle) (if (puzzle-complete-p puzzle) puzzle @@ -174,7 +177,7 @@ (funcall x-y-z-function x y z size) (if (puzzle-elt puzzle i j k) (f (1+ z)) - (or (solve (fill-true puzzle i j k)) + (or (puzzle-solve (fill-true puzzle i j k)) (f (1+ z)))))))) (f 0))))

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
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