From a5c0aef999e47ebf3292e6950b53205a1ee12346 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Wed, 27 Aug 2008 21:32:42 +0200 Subject: [PATCH] whitespace (lispstat.asd) and stat model move (lispstat.asd and others). --- lispstat.asd | 125 +++++++++++---------- bayes.lsp => src/stat-models/bayes.lsp | 0 model-fit.lisp => src/stat-models/model-fit.lisp | 0 model.lisp => src/stat-models/model.lisp | 0 nonlin.lsp => src/stat-models/nonlin.lsp | 0 .../stat-models/regression-clos.lisp | 0 .../stat-models/regression-matlisp.lsp | 0 regression.lsp => src/stat-models/regression.lsp | 0 8 files changed, 65 insertions(+), 60 deletions(-) rename bayes.lsp => src/stat-models/bayes.lsp (100%) rename model-fit.lisp => src/stat-models/model-fit.lisp (100%) rename model.lisp => src/stat-models/model.lisp (100%) rename nonlin.lsp => src/stat-models/nonlin.lsp (100%) rename regression-clos.lisp => src/stat-models/regression-clos.lisp (100%) rename regression-matlisp.lsp => src/stat-models/regression-matlisp.lsp (100%) rename regression.lsp => src/stat-models/regression.lsp (100%) diff --git a/lispstat.asd b/lispstat.asd index 6d44539..c3f06a8 100644 --- a/lispstat.asd +++ b/lispstat.asd @@ -2,12 +2,7 @@ ;;; 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-27 21:16:50 tony> +;;; Time-stamp: <2008-09-17 20:20:17 tony> ;;; Created: <2005-05-30 17:09:47 blindglobe> ;; What package should we be in? Contaminating cl-user is probably EVIL. @@ -125,63 +120,73 @@ Last touched 1991, then in 2005--2008." "lsmacros" "lsfloat")))) - (:module "numerics-internal" - :pathname "src/numerics/" - :depends-on ("proto-objects" "lispstat-core") - :components - ((:lispstat-lsp-source-file "cffiglue") - (:lispstat-lsp-source-file "dists" - :depends-on ("cffiglue")) - (:lispstat-lsp-source-file "matrices" - :depends-on ("cffiglue")) - (:lispstat-lsp-source-file "ladata" - :depends-on ("cffiglue" - "matrices")) - (:lispstat-lsp-source-file "linalg" - :depends-on ("cffiglue" - "matrices" - "ladata")))) - - (:module "stat-data" - :pathname "src/data/" - :depends-on ("proto-objects" - "lispstat-core" - "numerics-internal") - :components - (;; (:file "data-clos") - (:file "data"))) + (:module + "numerics-internal" + :pathname "src/numerics/" + :depends-on ("proto-objects" "lispstat-core") + :components + ((:lispstat-lsp-source-file "cffiglue") + (:lispstat-lsp-source-file "dists" + :depends-on ("cffiglue")) + (:lispstat-lsp-source-file "matrices" + :depends-on ("cffiglue")) + (:lispstat-lsp-source-file "ladata" + :depends-on ("cffiglue" + "matrices")) + (:lispstat-lsp-source-file "linalg" + :depends-on ("cffiglue" + "matrices" + "ladata")))) + + (:module + "stat-data" + :pathname "src/data/" + :depends-on ("proto-objects" + "lispstat-core" + "numerics-internal") + :components + (;; (:file "data-clos") + (:file "data"))) ;; there is a circ reference which we need to solve. - (:lispstat-lsp-source-file "lsbasics" - :depends-on ("proto-objects" - "lispstat-core" - "numerics-internal" )) - - (:lispstat-lsp-source-file "statistics" - :depends-on ("proto-objects" - "lispstat-core" - "numerics-internal" - "stat-data" - "lsbasics")) - - (:file "optimize" :depends-on ("proto-objects" - "lispstat-core" - "numerics-internal")) + (:lispstat-lsp-source-file + "lsbasics" + :depends-on ("proto-objects" + "lispstat-core" + "numerics-internal" )) + + (:lispstat-lsp-source-file + "statistics" + :depends-on ("proto-objects" + "lispstat-core" + "numerics-internal" + "stat-data" + "lsbasics")) + + (:file + "optimize" + :depends-on ("proto-objects" + "lispstat-core" + "numerics-internal")) ;; Applications - (:lispstat-lsp-source-file "regression" - :depends-on ("proto-objects" - "lispstat-core" - "numerics-internal" - "lsbasics" - "statistics")) -; (:lispstat-lsp-source-file "nonlin" -; :depends-on ("regression")) - -; (:lispstat-lsp-source-file "bayes" -; :depends-on ("proto-objects" -; "lsmath" -; "dists")) + (:module + "stat-models" + :pathname "src/stat-model/" + :depends-on ("proto-objects" + "lispstat-core" + "numerics-internal" + "lsbasics" + "statistics") + :components + ((:lispstat-lsp-source-file "regression") + ;; (:lispstat-lsp-source-file "nonlin" + ;; :depends-on ("regression")) + ;; (:lispstat-lsp-source-file "bayes" + ;; :depends-on ("proto-objects" + ;; "lsmath" + ;; "dists")) + )) (:module "lisp-stat-one" @@ -192,7 +197,7 @@ Last touched 1991, then in 2005--2008." "lsbasics" "stat-data" "statistics" - "regression") + "stat-models") :components ((:file "ls-user"))) (:module diff --git a/bayes.lsp b/src/stat-models/bayes.lsp similarity index 100% rename from bayes.lsp rename to src/stat-models/bayes.lsp diff --git a/model-fit.lisp b/src/stat-models/model-fit.lisp similarity index 100% rename from model-fit.lisp rename to src/stat-models/model-fit.lisp diff --git a/model.lisp b/src/stat-models/model.lisp similarity index 100% rename from model.lisp rename to src/stat-models/model.lisp diff --git a/nonlin.lsp b/src/stat-models/nonlin.lsp similarity index 100% rename from nonlin.lsp rename to src/stat-models/nonlin.lsp diff --git a/regression-clos.lisp b/src/stat-models/regression-clos.lisp similarity index 100% rename from regression-clos.lisp rename to src/stat-models/regression-clos.lisp diff --git a/regression-matlisp.lsp b/src/stat-models/regression-matlisp.lsp similarity index 100% rename from regression-matlisp.lsp rename to src/stat-models/regression-matlisp.lsp diff --git a/regression.lsp b/src/stat-models/regression.lsp similarity index 100% rename from regression.lsp rename to src/stat-models/regression.lsp -- 2.11.4.GIT