From 2050d5f56b922c26cf0cbca548f5cd16bfa234a7 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Tue, 15 Dec 2009 16:18:35 +0100 Subject: [PATCH] old lispstat config variable names changed to cls- names. Signed-off-by: AJ Rossini --- examples/linear-regression.lisp | 4 ++-- src/basics/defsys.lsp | 24 ++++++++++++------------ src/packages.lisp | 5 ++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/examples/linear-regression.lisp b/examples/linear-regression.lisp index a5dc824..8c0e686 100644 --- a/examples/linear-regression.lisp +++ b/examples/linear-regression.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-07-12 13:20:41 tony> +;;; Time-stamp: <2009-12-13 18:02:13 tony> ;;; Creation: <2009-04-19 09:41:09 tony> ;;; File: linear-regression.lisp ;;; Author: AJ Rossini @@ -65,7 +65,7 @@ (defparameter *my-df* (make-dataframe (rsm.string::file->string-table - (concatenate 'string *lispstat-data-dir* "file.dsv")) + (concatenate 'string *cls-data-dir* "file.dsv")) "Initial read-in of data.")) (defparameter *my-resp-var* (slice *my-df* )) diff --git a/src/basics/defsys.lsp b/src/basics/defsys.lsp index 25e4da4..2cddb63 100644 --- a/src/basics/defsys.lsp +++ b/src/basics/defsys.lsp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-12-03 17:18:04 tony> +;;; Time-stamp: <2009-12-13 18:08:35 tony> ;;; Creation: <2009-08-26 13:48:13 tony> ;;; File: defsys.lsp ;;; Author: AJ Rossini @@ -26,31 +26,31 @@ (defvar *default-path* "./") -(defvar *lispstat-home-dir* #p"/media/disk/Desktop/sandbox/CLS.git/" +(defvar *cls-home-dir* #p"/usr/share/cls/" "Value considered \"home\" for our data") -(setf *lispstat-home-dir* +(setf *cls-home-dir* ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/"w ;; #p"/home/tony/sandbox/CommonLispStat.git/" #p"/home/tony/sandbox/CLS.git/") (defmacro ls-dir (root-str) - `(pathname (concatenate 'string (namestring *lispstat-home-dir*) ,root-str))) + `(pathname (concatenate 'string (namestring *cls-home-dir*) ,root-str))) (defmacro ls-defdir (target-dir-var root-str) `(defvar ,target-dir-var (ls-dir ,root-str))) -;;(macroexpand '(ls-defdir *lispstat-asdf-dir* "ASDF")) -;;(macroexpand-1 '(ls-defdir *lispstat-asdf-dir* "ASDF")) +;;(macroexpand '(ls-defdir *cls-asdf-dir* "ASDF")) +;;(macroexpand-1 '(ls-defdir *cls-asdf-dir* "ASDF")) ;;(macroexpand-1 '(ls-dir "ASDF")) -(ls-defdir *lispstat-asdf-dir* "ASDF/") -(ls-defdir *lispstat-data-dir* "Data/") -(ls-defdir *lispstat-external-dir* "external/") -(ls-defdir *lispstat-examples-dir* "examples/") +(ls-defdir *cls-asdf-dir* "ASDF/") +(ls-defdir *cls-data-dir* "Data/") +(ls-defdir *cls-external-dir* "external/") +(ls-defdir *cls-examples-dir* "examples/") ;; Load ASDF if it isn't loaded -#-asdf(load (pathname (concatenate 'string (namestring *lispstat-external-dir*) "asdf"))) +#-asdf(load (pathname (concatenate 'string (namestring *cls-external-dir*) "asdf"))) ;; (pushnew #p"C:/Lisp/libs/" asdf-util:*source-dirs* :test #'equal) -;;(pushnew *lispstat-asdf-dir* asdf:*central-registry*)) +;;(pushnew *cls-asdf-dir* asdf:*central-registry*)) diff --git a/src/packages.lisp b/src/packages.lisp index 63c3c4b..60b084e 100644 --- a/src/packages.lisp +++ b/src/packages.lisp @@ -1,6 +1,6 @@ ;;; -*- mode: lisp -*- -;;; Time-stamp: <2009-12-06 10:05:51 tony> +;;; Time-stamp: <2009-12-13 18:04:07 tony> ;;; Creation: <2008-03-11 19:18:34 user> ;;; File: packages.lisp ;;; Author: AJ Rossini @@ -35,7 +35,6 @@ (: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*)) @@ -423,7 +422,7 @@ (:export ;; lisp-stat-config: *default-path* *lsos-files* *basic-files* *ls-files* - *lispstat-home-dir* *lispstat-data-dir* *lispstat-examples-dir* +l *cls-home-dir* *cls-data-dir* *cls-examples-dir* ;; lsobjects : defproto defproto2 -- 2.11.4.GIT