From 1f5a06e231242c790b698f57452d57e9acd14ef7 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Wed, 24 Mar 2010 14:07:15 +0100 Subject: [PATCH] proper loading. Signed-off-by: AJ Rossini --- TODO.lisp | 21 ++++++++++++++++----- cls.asd | 5 +++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/TODO.lisp b/TODO.lisp index 6953af6..c04634f 100644 --- a/TODO.lisp +++ b/TODO.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2010-01-27 17:31:07 tony> +;;; Time-stamp: <2010-03-19 08:17:46 tony> ;;; Creation: <2008-09-08 08:06:30 tony> ;;; File: TODO.lisp ;;; Author: AJ Rossini @@ -35,7 +35,7 @@ (asdf:oos 'asdf:load-op 'cl-typesetting)) ;;INFRA - ;; (asdf:oos 'asdf:compile-op 'asdf-system-connections :force t) + ;; (asdf:oos 'asdf:compile-op 'asdf-system-connections :force t) ;; (asdf:oos 'asdf:compile-op 'lisp-matrix) ;; (asdf:oos 'asdf:load-op 'xarray) @@ -63,7 +63,7 @@ ;; (asdf:oos 'asdf:load-op 'cl-glut-examples) ;; (asdf:oos 'asdf:load-op 'cells) - ;; (asdf:oos 'asdf:load-op 'bordeaux-threads) + (asdf:oos 'asdf:load-op 'bordeaux-threads) ;; (asdf:oos 'asdf:load-op 'cells-gtk) (init-CLS)) @@ -113,21 +113,32 @@ ('d "test3" 3 3d0) ('e "test4" 4 4d0)) :doc "test reality" - :case-labels (list "0" "1" "2" "3" "4") + :case-labels (list "0" "1" 2 "3" "4") :var-labels (list "symbol" "string" "integer" "double-float") :var-types (list 'symbol 'string 'integer 'double-float))) *df-test* ; but with SBCL, ints become floats? (defun check-var (df colnum) - (let ((nobs (xdim df 0))) + (let ((nobs (xdim (dataset df) 0))) (dotimes (i nobs) (check-type (xref df i colnum) (elt (var-types df) i))))) +(xdim (dataset *df-test*) 1) +(xdim (dataset *df-test*) 0) + (check-var *df-test* 0) +(check-type (xref *df-test* 1 1) simple-character-string) (xref *df-test* 1 2) +(class-of + (xref *df-test* 1 1) ) + +(check-type) + + + (integerp (xref *df-test* 1 2)) (floatp (xref *df-test* 1 2)) (integerp (xref *df-test* 1 3)) diff --git a/cls.asd b/cls.asd index d839593..a694864 100644 --- a/cls.asd +++ b/cls.asd @@ -1,5 +1,5 @@ ;; -*- mode: lisp -*- -;;; Time-stamp: <2010-02-09 08:33:51 tony> +;;; Time-stamp: <2010-02-13 15:24:47 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> ;;; File: cls.asd ;;; Author: AJ Rossini @@ -69,7 +69,8 @@ :listoflist :lift :rsm-string - ;; :cl-cairo2 :cl-2d + ;; :cl-random ;; or cl-variates, or...? + ;; :cl-cairo2 :cl-2d ) :components ((:static-file "version" :pathname #p"version.lisp-expr") (:static-file "LICENSE.mit") -- 2.11.4.GIT