Changeset 47 for trunk/histogram

Timestamp:

03/28/08 03:12:26 (8 months ago)

Author:

lhealy

Message:

Unification of errors and warnings using a single class
'gsl-condition. Each numbered GSL conditions is a subclass of this
condition, under the name given by GSL, e.g. 'EDOM.

Files:

• trunk/histogram/updating-accessing.lisp (modified) (4 diffs)

trunk/histogram/updating-accessing.lisp

@@ -1 +1 @@
 ;; Updating and accessing histogram elements.
 ;; Liam Healy, Mon Jan  1 2007 - 14:43
-;; Time-stamp: <2008-02-23 18:49:16EST updating-accessing.lisp>
+;; Time-stamp: <2008-03-27 23:09:26EDT updating-accessing.lisp>
 ;; $Id$
 
@@ -117 +117 @@
               ((first values) (second values))))
 
-;;; Examples and unit test
-
-#|
-(make-tests histogram
  (letm ((histo (histogram 10)))         ; should be a gsl-warning here, how to check?
      (set-ranges-uniform histo 0.0d0 10.0d0)
      (increment histo -2.0d0))
+;;; Examples and unit test
+
+#|
+(make-tests histogram
+   ;; The first one gives a warning while compiling in SBCL,
+   ;; should only give a warning while runnin.
+ (letm ((histo (histogram 10)))
+     (set-ranges-uniform histo 0.0d0 10.0d0)
+     (increment histo -2.0d0))
  (letm ((histo (histogram 10)))
    (set-ranges-uniform histo 0.0d0 10.0d0)
@@ -162 +167 @@
 
 (LISP-UNIT:DEFINE-TEST HISTOGRAM
-  (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
-   (LIST)
-   (MULTIPLE-VALUE-LIST
-    (LETM ((HISTO (HISTOGRAM 10)))
-      (SET-RANGES-UNIFORM HISTO 0.0d0 10.0d0)
-      (INCREMENT HISTO -2.0d0))))
+  (LISP-UNIT:ASSERT-ERROR
+   'GSL-CONDITION
+   (LETM ((HISTO (HISTOGRAM 10)))
+     (SET-RANGES-UNIFORM HISTO 0.0d0 10.0d0)
+     (INCREMENT HISTO -2.0d0)))
   (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
    (LIST 0.0d0)
@@ -193 +197 @@
       (MAREF HISTO 6))))
   (LISP-UNIT:ASSERT-ERROR
-   'GSL-ERROR
+   'GSL-CONDITION
    (LETM ((HISTO (HISTOGRAM 10)))
      (SET-RANGES-UNIFORM HISTO 0.0d0 10.0d0)