From 284e621901b64f27b2805bee9343cb651e921196 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Sun, 13 Dec 2009 17:55:00 +0100 Subject: [PATCH] clean up config, now CLS special vars, not LISP-STAT Signed-off-by: AJ Rossini --- cls.asd | 42 ++++++++++-------------------------------- src/basics/defsys.lsp | 4 ++-- src/data/import.lisp | 10 +++++----- src/packages.lisp | 11 ++++++++++- 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/cls.asd b/cls.asd index e5e7385..80a5e72 100644 --- a/cls.asd +++ b/cls.asd @@ -1,5 +1,5 @@ ;; -*- mode: lisp -*- -;;; Time-stamp: <2009-10-02 09:00:12 tony> +;;; Time-stamp: <2009-12-13 17:51:37 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> ;;; File: cls.asd ;;; Author: AJ Rossini @@ -17,8 +17,7 @@ (:use :common-lisp) (:export *default-path* *lsos-files* *basic-files* *ls-files* - *cls-home-dir* - *cls-data-dir* *cls-examples-dir*)) + *cls-home-dir* *cls-data-dir* *cls-examples-dir*)) (in-package :lisp-stat-config) @@ -41,24 +40,12 @@ (ls-defdir *cls-asdf-dir* "ASDF/") (ls-defdir *cls-data-dir* "Data/") - (ls-defdir *cls-external-dir* "external/") -) + (ls-defdir *cls-external-dir* "external/")) ;;(pushnew *cls-asdf-dir* asdf:*central-registry*) - ;; (pushnew #p"C:/Lisp/libs/" asdf-util:*source-dirs* :test #'equal) ; eg for Microsoft -;;; back to our regularly scheduled work... -;;; We should not need these, I think, but? -;; (asdf:oos 'asdf:compile-op :cffi) ;; FFI -;; (asdf:oos 'asdf:compile-op :lift) ;; Unit Testing -;; (asdf:oos 'asdf:load-op :cffi) ;; FFI -;; (asdf:oos 'asdf:load-op :lift) ;; Unit Testing - -;;; MAJOR HACK, FIXME! -;;(load "/media/disk/Desktop/sandbox/matlisp.git/start.lisp") - (in-package :cl-user) (defpackage #:cls-system @@ -100,14 +87,15 @@ :author "A.J. Rossini " :license "BSD" :description "Common Lisp Statistics (CLS): A System for Statistical - Computing with Common Lisp; based on CLS alpha1 by Luke Tierney - (apparently originally written when Luke was - at CMU, on leave at Bell Labs?). Last touched by him in 1991, then - by AJR in 2005--2009." + Computing with Common Lisp; based on Common LispStat (CLS alpha1) by + Luke Tierney (apparently originally written + when Luke was at CMU, on leave at Bell Labs?). Last touched by him + in 1991, then by AJR starting in 2005." :serial t :depends-on (:cffi :xarray - :lisp-matrix + :lisp-matrix ; on fnv, cl-blapack, ffa + :listoflist :lift :rsm-string ;; :cl-cairo2 :cl-2d @@ -116,19 +104,9 @@ (:static-file "LICENSE") (:static-file "README") - ;; reading in DSV files for data access -#| - (:module - "csv-data" - :pathname "src/data/" - :components - ((:file "test-cybertiggyr") - (:file "dsv-cybertiggyr" :depends-on ( "test-cybertiggyr")))) -|# (:module "packaging" :pathname #p"src/" - ;; :depends-on ("csv-data") :components ((:file "packages"))) @@ -145,7 +123,7 @@ :serial t :depends-on ("packaging" "proto-objects") :components - (; (:cls-lsp-source-file "defsys") + (;(:cls-lsp-source-file "defsys") ; XLS compat? (:cls-lsp-source-file "lstypes") (:cls-lsp-source-file "lsfloat") diff --git a/src/basics/defsys.lsp b/src/basics/defsys.lsp index 62c6c1c..25e4da4 100644 --- a/src/basics/defsys.lsp +++ b/src/basics/defsys.lsp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-08-26 13:49:09 tony> +;;; Time-stamp: <2009-12-03 17:18:04 tony> ;;; Creation: <2009-08-26 13:48:13 tony> ;;; File: defsys.lsp ;;; Author: AJ Rossini @@ -32,7 +32,7 @@ (setf *lispstat-home-dir* ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/"w ;; #p"/home/tony/sandbox/CommonLispStat.git/" - #p"/media/disk/Desktop/sandbox/CLS.git/") + #p"/home/tony/sandbox/CLS.git/") (defmacro ls-dir (root-str) `(pathname (concatenate 'string (namestring *lispstat-home-dir*) ,root-str))) diff --git a/src/data/import.lisp b/src/data/import.lisp index f4e8470..06fe2e4 100644 --- a/src/data/import.lisp +++ b/src/data/import.lisp @@ -3,7 +3,7 @@ ;;; See COPYRIGHT file for any additional restrictions (BSD license). ;;; Since 1991, ANSI was finally finished. Edited for ANSI Common Lisp. -;;; Time-stamp: <2009-08-26 13:50:28 tony> +;;; Time-stamp: <2009-12-06 10:08:34 tony> ;;; Creation: <2008-09-03 08:10:00 tony> ;;; File: import.lisp ;;; Author: AJ Rossini @@ -126,16 +126,16 @@ Reads the data in FILE as COLS columns and returns a list of lists representing (defun load-data (file) "Args: (file) as string Read in data file from the data examples library." - (if (load (path-string-to-path *lispstat-data-dir* file)) + (if (load (path-string-to-path *cls-data-dir* file)) t - (load (path-string-to-path *lispstat-data-dir* file)))) + (load (path-string-to-path *cls-data-dir* file)))) (defun load-example (file) "Args: (file) as string Read in lisp example file from the examples library." - (if (load (path-string-to-path *lispstat-examples-dir* file)) + (if (load (path-string-to-path *cls-examples-dir* file)) t - (load (path-string-to-path *lispstat-examples-dir* file)))) + (load (path-string-to-path *cls-examples-dir* file)))) ;;; ;;; Saving Variables and Functions diff --git a/src/packages.lisp b/src/packages.lisp index 4f34051..63c3c4b 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-10-30 08:17:46 tony> +;;; Time-stamp: <2009-12-06 10:05:51 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -29,6 +29,15 @@ ;;; Basics +(defpackage :lisp-stat-config + (:documentation "global settings and variables. Probably need a + localization tool as well.") + (:use :common-lisp) + (:export *common-lisp-stat-version* + *default-path* *lsos-files* *basic-files* *ls-files* + ;; *lispstat-home-dir* *lispstat-data-dir* *lispstat-examples-dir* + + *cls-data-dir* *cls-home-dir* *cls-examples-dir*)) (defpackage :lisp-stat-object-system (:nicknames :ls-objects :lsos) -- 2.11.4.GIT