From 22a16014d69d1f2291ecf1f8c14a77b9b2e2c5cc Mon Sep 17 00:00:00 2001
From: AJ Rossini <blindglobe@gmail.com>
Date: Wed, 5 Nov 2008 08:22:14 +0100
Subject: [PATCH] no requiring at this stage or loading data, for the "Data"
 files.  We need to refactor them so that they will do the right thing, most
 of the time.

---
 Data/aircraft.lsp |  2 +-
 Data/book.lsp     | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Data/aircraft.lsp b/Data/aircraft.lsp
index 66af14c..3d2db37 100644
--- a/Data/aircraft.lsp
+++ b/Data/aircraft.lsp
@@ -10,7 +10,7 @@
 
 
 
-(require "maximize")
+;;(require "maximize")
 
 (def failure-times
      '((413 14 58 37 100 65 9 169 447 184 36 201 118 34 31 
diff --git a/Data/book.lsp b/Data/book.lsp
index 12daa8b..7cb829a 100644
--- a/Data/book.lsp
+++ b/Data/book.lsp
@@ -6,12 +6,14 @@
 ;;; FIXME: Shutup compiler warnings, need to clean up and
 ;;; appropriately initialize.
 
-(load-data "tutorial")
-(load-data "oxygen")
-(load-data "puromycin")
-(load-data "aircraft")
-(load-data "leukemia")
-(load-data "stackloss")
+;;; Need to fix this up!  
+;;(load-data "tutorial")
+;;(load-data "oxygen")
+;;(load-data "puromycin")
+;;(load-data "aircraft")
+;;(load-data "leukemia")
+;;(load-data "stackloss")
+
 (def precipitation
      (list .77 1.74 .81 1.20 1.95 1.20 .47 1.43 3.37 2.20
             3.00 3.09 1.51 2.10 .52 1.62 1.31 .32 .59 .81
@@ -60,6 +62,13 @@
 (def moist (list 21 20 16 18 16 18 12 12 13 13 17 24 11 10 17
                  14 14 14 20 12 11 10 16 17 17 17 15 17 21 21
                  21 26 21 17 11))
-(def ratio (list 2.4 2.4 2.4 2.5 3.2 3.1 3.2 2.7 2.7 2.7 2.7
-                 2.8 2.5 2.6 2 2 2.0 1.9 2.1 1.9 2 2.0 2.0 2.2 2.4
-                 2.4 2.4 2.2 2.2 1.9 2.4 3.5 3 3.5 3.2))
+
+;;; The following variable name, "ratio" causes major conflicts with
+;;; reserved CL words.  I think that we need to ensure that we somehow
+;;; use a generic name, which would allow for marking symbols as a
+;;; "Lisp-3", i.e. with data-analysis-vars being the 3rd level of the
+;;; lisp. 
+
+;;(def ratio (list 2.4 2.4 2.4 2.5 3.2 3.1 3.2 2.7 2.7 2.7 2.7
+;;                 2.8 2.5 2.6 2 2 2.0 1.9 2.1 1.9 2 2.0 2.0 2.2 2.4
+;;                 2.4 2.4 2.2 2.2 1.9 2.4 3.5 3 3.5 3.2))
-- 
2.11.4.GIT