Skip to content

Commit

Permalink
File issues #9, #10, #11, #12, #13
Browse files Browse the repository at this point in the history
There are several functions preventing compilation and loading via
(asdf:operate 'asdf:load-op 'kenzo). They've been commented for now.
  • Loading branch information
gheber committed Jun 15, 2015
1 parent b9a6785 commit f092de2
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/chain-complexes.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@

;;; FUNCTIONS


(DEFUN NRESULTS ()
(the fixnum
(let ((nrslts 0))
Expand All @@ -240,6 +239,7 @@
(rslts item))))
nrslts)))

#|
(DEFUN TIME-LIST ()
(the list
(let ((time-list +empty-list+))
Expand All @@ -258,6 +258,7 @@
drslt))
(rslts item))))
(sort time-list #'>))))
|#

(DEFUN CLEAN-RESULTS (&optional (results-coef *results-coef*))
(declare
Expand Down Expand Up @@ -292,8 +293,6 @@
(format t "~%*CR* -- Cut = ~A -- N = ~A" cut *results-n*)))))




(DEFUN MRPH-GNRT (cmpr2 intr degr gnrt memory
&optional (left -1) (right (fill-pointer memory)))
(declare
Expand Down Expand Up @@ -393,7 +392,6 @@
(cdar mark1)))))
cmbn)


#|
(DEFVAR *PROFILER-STACK*)
(SETF *PROFILER-STACK* +empty-list+)
Expand All @@ -419,6 +417,7 @@
(incf (wrtm mrph) time-spent)))
|#


(DEFUN GNRT-? (mrph degr gnrt)
(declare
(type morphism mrph)
Expand Down
2 changes: 2 additions & 0 deletions src/cobar.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
(? cf 2 (allp 1 (crpr 0 (d 7) 0 (d 7)) 1 (crpr 0 (d 56) 0 (d 56))))
|#

#|
(DEFUN HMTP-VRTC-COBAR-INTR (h gf)
(declare (type morphism h gf))
(flet ((rslt (degr allp)
Expand Down Expand Up @@ -578,6 +579,7 @@
:degr (1+ degr)
:list (rest rslt)))))
(the intr-mrph #'rslt)))
|#

#|
(require "special-smsts")
Expand Down
2 changes: 2 additions & 0 deletions src/ls-twisted-products.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@
(pop-first-absm 4 (cdr (loop3 2 'a +1 1 'b 3)))
|#

#|
(DEFUN CRTS-CONTRACTION-INTR (base-cmpr base-bspn base-face crts-cmpr)
(declare
(type cmprf base-cmpr crts-cmpr)
Expand Down Expand Up @@ -400,6 +401,7 @@
(hh absm1 loop-absm2)))))))
(the intr-mrph #'rslt)))
|#

#|
()
Expand Down
2 changes: 2 additions & 0 deletions src/smith.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@
(minimal-rest-2 m 1)
|#

#|
(DEFUN MINIMAL-TERM-TOP-LEFT (mtrx-list begin il ic)
(declare
(list mtrx-list)
Expand All @@ -479,6 +480,7 @@
(when (minusp (aref (third mtrx-list) begin begin))
(line-minus-5 mtrx-list begin begin))
mtrx-list)))
|#

#|
(setf p (idnt-mtrx 4) p-1 (idnt-mtrx 4)
Expand Down
2 changes: 2 additions & 0 deletions src/tensor-products.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
(print (funcall bas i))))
|#

#|
(DEFUN TNSR-PRDC-INTR-DFFR (dffr1 dffr2)
(declare (type morphism dffr1 dffr2))
(flet ((rslt (degr tnpr)
Expand Down Expand Up @@ -174,6 +175,7 @@
(tnpr degr1 gnrt1 degr2-1 gnrt2))))
list2))))))))
(the intr-mrph #'rslt)))
|#

#|
(cat-init)
Expand Down

4 comments on commit f092de2

@dimpase
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably it should be in a separate branch, to indicate that it actually breaks stuff.

@gheber
Copy link
Owner

@gheber gheber commented on f092de2 Jun 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, will do.

@gheber
Copy link
Owner

@gheber gheber commented on f092de2 Jun 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind checking the latest master? ASDF w/ SBCL should work.

@dimpase
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good on SBCL 1.1.12-1.fc20 (Linux Fedora 20) with its stock asdf. (I also ran all the tests, they all pass).

as well, all is good on SBCL 1.2.12 on Ubuntu 14.04, with the latest source asdf.

Please sign in to comment.