From 49fbcbc5a9a9c299cfcfd10c33ca2816ea0dc6b0 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Tue, 22 Jul 2008 12:18:30 +0200 Subject: [PATCH] refactored proto object system into src dir --- lispstat.asd | 54 ++++++++++++------------------- lsobjects.lsp => src/objsys/lsobjects.lsp | 0 2 files changed, 21 insertions(+), 33 deletions(-) rename lsobjects.lsp => src/objsys/lsobjects.lsp (100%) diff --git a/lispstat.asd b/lispstat.asd index 3ce1f0c..d9f3a8d 100644 --- a/lispstat.asd +++ b/lispstat.asd @@ -2,17 +2,13 @@ ;;; Copyright (c) 2005--2008, by AJ Rossini ;;; ASDF packaging for CommonLisp Stat ;;; License: BSD, see the top level directory file LICENSE for details. -;;; Time-stamp: <2008-08-07 08:27:42 tony> +;;; Time-stamp: <2008-09-17 20:08:29 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> - ;; (setf *my-base-directory* ;; #p"/home/tony/sandbox/CLS.git/" ;; #p"/Users/ungil/lisp/CommonLispStat/") - - - ;; What package should we be in? Contaminating cl-user is probably EVIL. (in-package :cl-user) @@ -22,11 +18,8 @@ ;; to self-initialize. (defvar *lispstat-home-dir* - ;; #p"/home/tony/sandbox/CommonLispStat.git/" ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/" ;; #p"/Users/ungil/lisp/CommonLispStat/") - ;; #p"/home/rossini/public_html/GIT.repos/CommonLispStat/" - ;; #p"/home/tony/Desktop/sandbox/CLS.git/" (directory-namestring (truename (asdf:system-definition-pathname :lispstat))) "Value considered \"home\" for our data") @@ -34,10 +27,7 @@ #| (setf *lispstat-home-dir* ;; #p"/cygdrive/c/local/sandbox/Lisp/CommonLispStat/" - ;; #p"/home/tony/sandbox/CommonLispStat.git/" ;; #p"/Users/ungil/lisp/CommonLispStat/") - ;; #p"/home/rossini/public_html/GIT.repos/CommonLispStat/" - ;; #p"/home/tony/Desktop/sandbox/CLS.git/" (directory-namestring (truename (asdf:system-definition-pathname :lispstat)))) |# @@ -63,13 +53,13 @@ ;;; 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 +;; (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 "/home/tony/Desktop/sandbox/matlisp.git/start.lisp") +;;; MAJOR HACK, FIXME! +;;(load "/media/disk/Desktop/sandbox/matlisp.git/start.lisp") (in-package :cl-user) @@ -108,16 +98,19 @@ based on CLS by Luke Tierney (originally written when Luke was at CMU, apparently). Last touched 1991, then in 2005--2008." :serial t - :depends-on (:cffi :lift) ;; :clem) not yet but soon! + :depends-on (:cffi :lift) ;; need a matrix library :components ((:static-file "version" :pathname #p"version.lisp-expr") - (:lispstat-lsp-source-file "lsobjects") + (:module "proto-objects" + :pathname "src/objsys/" + :components ((:lispstat-lsp-source-file "lsobjects"))) + (:lispstat-lsp-source-file "cffiglue") (:lispstat-lsp-source-file "defsys") (:lispstat-lsp-source-file "lstypes") (:lispstat-lsp-source-file "lsfloat") (:lispstat-lsp-source-file "compound" - :depends-on ("lsobjects")) + :depends-on ("proto-objects")) (:lispstat-lsp-source-file "lsmacros" :depends-on ("compound")) @@ -126,7 +119,7 @@ Last touched 1991, then in 2005--2008." "lsmacros")) (:lispstat-lsp-source-file "lsmath" - :depends-on ("lsobjects" + :depends-on ("proto-objects" "compound" "lsmacros" "lsfloat")) @@ -152,14 +145,14 @@ Last touched 1991, then in 2005--2008." "lstypes" "compound")) - (:file "data" :depends-on ("lsobjects" + (:file "data" :depends-on ("proto-objects" "compound" "matrices" "linalg")) ;; there is a circ reference which we need to solve. (:lispstat-lsp-source-file "lsbasics" - :depends-on ("lsobjects" + :depends-on ("proto-objects" "lstypes" "lsmacros" "lsfloat" @@ -168,14 +161,14 @@ Last touched 1991, then in 2005--2008." "dists")) (:lispstat-lsp-source-file "statistics" - :depends-on ("lsobjects" + :depends-on ("proto-objects" "lsbasics" "compound" "ladata" "matrices" "linalg" "lsmath" "data" )) - (:file "optimize" :depends-on ("lsobjects" + (:file "optimize" :depends-on ("proto-objects" "cffiglue" "lstypes" "compound" @@ -188,7 +181,7 @@ Last touched 1991, then in 2005--2008." ;; Applications (:lispstat-lsp-source-file "regression" - :depends-on ("lsobjects" + :depends-on ("proto-objects" "lsbasics" "compound" "lsmath" @@ -199,12 +192,12 @@ Last touched 1991, then in 2005--2008." ; :depends-on ("regression")) ; (:lispstat-lsp-source-file "bayes" -; :depends-on ("lsobjects" +; :depends-on ("proto-objects" ; "lsmath" ; "dists")) - (:file "ls-user" :depends-on ("lsobjects" + (:file "ls-user" :depends-on ("proto-objects" "lsbasics" "compound" "dists" @@ -231,11 +224,6 @@ Last touched 1991, then in 2005--2008." ;; preparation for modulization... ((:module - "lisp-stat-proto-objects" - :pathname "src/prototype/" - :comonents ((:lispstat-lsp-source-file "lsobjects")))) - -((:module "lisp-stat-testing" :pathname "src/unittests/" :components ((:file "unittests" :depends-on ("ls-user")) diff --git a/lsobjects.lsp b/src/objsys/lsobjects.lsp similarity index 100% rename from lsobjects.lsp rename to src/objsys/lsobjects.lsp -- 2.11.4.GIT