From 66e5b6696ca607e8711eb9522fb87df2ffd7a3c3 Mon Sep 17 00:00:00 2001
From: AJ Rossini <blindglobe@gmail.com>
Date: Sun, 18 Mar 2007 17:06:37 +0100
Subject: [PATCH] object system cleanup, continuing

---
 Makefile       | 43 ++++++++++++++++++++++++++-----------------
 bayes.lsp      |  8 +++++++-
 lsbasics.lsp   |  2 ++
 regression.lsp |  5 ++++-
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 51d86e7..46d1b4c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,18 @@ default:
 	@echo "   clisp - build using CLISP"
 	@echo "        "
 
+## Workspace cleanup
+
+clean:
+	(cd lib; make clean)
+	rm -f *.o *.fasl kclcmplr *~
+
+cleanall:
+	(cd lib; make cleanall)
+	rm -f *.o *.fasl kclcmplr saved_kcls kcls cls
+
+## C compilation
+
 #
 # Modify according to your system's needs for dynamic loading
 #
@@ -23,25 +35,22 @@ lib/clib.a:
 lib/exclglue.o:
 	(cd lib; make CFLAGS="${CFLAGS}" exclglue.o)
 
-clean:
-	(cd lib; make clean)
-	rm -f *.o *.fasl kclcmplr *~
 
-cleanall:
-	(cd lib; make cleanall)
-	rm -f *.o *.fasl kclcmplr saved_kcls kcls cls
+## Lisp targets and compilation
 
-#
-# This lets you use 'make objects' to make .o files for changed .lsp
-# files for kcl. If you use this approach, use 'cat makesys.kcl | kcl'
-# to make the executable.
-#
+sbcl : 
+
+
+clisp : 
+
+
+## Debugging/Building
+
+
+sbcl-debug :
+
+
+clisp-debug : 
 
-OBJECTS=bayes.o compound.o dists.o fastmap.o kclglue.o \
-	kclpatch.o ladata.o linalg.o lsbasics.o lsfloat.o lsmath.o \
-	lsobjects.o lstoplevel.o matrices.o maximize.o nonlin.o \
-	regression.o statistics.o
 
-.lsp.o:
-	./kclcmplr ./ $*.lsp $*.lsp S1000
 
diff --git a/bayes.lsp b/bayes.lsp
index fe62c5b..7a2332c 100644
--- a/bayes.lsp
+++ b/bayes.lsp
@@ -9,7 +9,13 @@
 ;;;; You may give out copies of this software; for conditions see the file
 ;;;; COPYING included with this distribution.
 
-(in-package #:lisp-stat)
+
+(defpackage :lisp-stat-bayes
+  (:use :lisp-stat-object-system
+	:lisp-stat-basics))
+
+(in-package :lisp-stat-bayes)
+
 
 ;;; Objects Representing Functions
 
diff --git a/lsbasics.lsp b/lsbasics.lsp
index 6961eec..c2bc842 100644
--- a/lsbasics.lsp
+++ b/lsbasics.lsp
@@ -18,6 +18,7 @@
 	:lisp-stat-fastmap
 	:lisp-stat-float
 	:lisp-stat-macros
+	:lisp-stat-compound-data
 	:lisp-stat-sequence)
   (:shadowing-import-from :lisp-stat-object-system
 			  slot-value call-method call-next-method)
@@ -25,6 +26,7 @@
    ;; lsbasics.lisp
    copy-vector copy-array which repeat
    permute-array sum prod count-elements mean if-else sample sort-data
+   select
    
    ;; matrices.lisp
    matrixp num-rows num-cols matmult identity-matrix diagonal row-list
diff --git a/regression.lsp b/regression.lsp
index 27dc351..9e5fa0a 100644
--- a/regression.lsp
+++ b/regression.lsp
@@ -19,7 +19,10 @@
 (defpackage :lisp-stat-regression-linear
   (:use :common-lisp
 	:lisp-stat-object-system
-	:lisp-stat-basics)
+	:lisp-stat-basics
+	:lisp-stat-compound-data
+	:lisp-stat-matrix
+	:lisp-stat-sequence)
   (:shadowing-import-from :lisp-stat-object-system
 			  slot-value call-method call-next-method)
   (:export regression-model regression-model-proto x y intercept sweep-matrix
-- 
2.11.4.GIT