From 46e1e7343f3e2eb6b9ddfdd443ddedef75d14de1 Mon Sep 17 00:00:00 2001 From: "Liam M. Healy" <lnp@healy.washington.dc.us> Date: Fri, 19 Aug 2011 09:51:47 -0400 Subject: [PATCH] Test ntuple in histogram by writing the data to a temporary file, then reading the file --- documentation/index.html | 10 ++++++---- gsll.asd | 5 +++-- histogram/ntuple.lisp | 20 ++++++++++++-------- tests/ntuple.lisp | 4 ++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/documentation/index.html b/documentation/index.html index 69fc60d8..851acdbc 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -122,6 +122,7 @@ combination for which the following are supported:</p> </li> <li><a href="http://www.cliki.net/trivial-garbage">trivial-garbage</a> <li><a href="http://repo.or.cz/w/antik.git">Antik</a><li><a href="http://www.cliki.net/asdf">ASDF</a></li> +<li>Osicat</li> <li><a href="http://repo.or.cz/w/lisp-unit.git">lisp-unit</a>, <i>(Optional)</i> necessary to run <code>gsll-tests</code> </li> @@ -152,9 +153,10 @@ combination for which the following are supported:</p> and <code>libffi-dev</code>. Once they are installed and you have loaded the quicklisp file: <pre> - (ql:quickload "gsll-tests")</pre> + (ql:quickload "gsll")</pre> <p>To test your installation: <pre> + (ql:quickload "lisp-unit") (in-package :gsl) (lisp-unit:run-tests)</pre> <p>The result should look something like: @@ -167,8 +169,8 @@ AIRY: 73 assertions passed, 0 failed.</pre> VECTOR-VARIANCE-WITH-MEAN: 10 assertions passed, 0 failed. WEIBULL: 60 assertions passed, 0 failed. ZETA: 6 assertions passed, 0 failed. -TOTAL: 4019 assertions passed, 1 failed, 0 execution errors.</pre> - <p>You may see more failures. +TOTAL: 4022 assertions passed, 1 failed, 0 execution errors.</pre> + <p>You may see more failures; if you are not on a 64 bit platform you will see fewer assertions. <h3>License</h3> <p> @@ -343,7 +345,7 @@ four-digit number; please attach them all to your email. <!-- Created: Feb 25 2005 --> <!-- hhmts start --> <small> -Time-stamp: <2011-08-17 01:00:15EDT index.html> +Time-stamp: <2011-08-19 10:00:41EDT index.html> </small> <!-- hhmts end --> </div> diff --git a/gsll.asd b/gsll.asd index 0b755a7a..48cb454a 100644 --- a/gsll.asd +++ b/gsll.asd @@ -1,6 +1,6 @@ ;; Definition of GSLL system ;; Liam Healy -;; Time-stamp: <2011-01-30 10:41:57EST gsll.asd> +;; Time-stamp: <2011-08-19 08:59:15EDT gsll.asd> ;; ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -30,7 +30,8 @@ :version "0" :author "Liam M. Healy" :licence "GPL v3" - :depends-on (antik cffi-grovel trivial-garbage alexandria #+fsbv fsbv) + :depends-on (antik cffi-grovel trivial-garbage alexandria #+fsbv fsbv + osicat) :components ((:module init :components diff --git a/histogram/ntuple.lisp b/histogram/ntuple.lisp index 5c8a4a1a..a0ce201a 100644 --- a/histogram/ntuple.lisp +++ b/histogram/ntuple.lisp @@ -1,8 +1,8 @@ ;; N-tuples ;; Liam Healy Sat Feb 3 2007 - 12:53 -;; Time-stamp: <2011-05-26 12:37:35EDT ntuple.lisp> +;; Time-stamp: <2011-08-19 09:44:16EDT ntuple.lisp> ;; -;; Copyright 2007, 2008, 2009 Liam M. Healy +;; Copyright 2007, 2008, 2009, 2011 Liam M. Healy ;; Distributed under the terms of the GNU General Public License ;; ;; This program is free software: you can redistribute it and/or modify @@ -159,10 +159,8 @@ (defparameter *ntuple-example-data-file* (namestring - (merge-pathnames - "ntuple-example.dat" - (asdf:component-pathname - (asdf:find-component (asdf:find-system :gsll) "histogram")))) + (merge-pathnames "ntuple-example.dat" osicat::*temporary-directory*)) + ;;(asdf:system-relative-pathname :gsll #p"histogram/ntuple-example.dat") "The full path string of the ntuple example data file. This can be created with the function #'make-ntuple-example-data.") @@ -238,6 +236,12 @@ (unless (= (grid:aref histo row) (aref answer row)) (return nil)))))) -(save-test ntuple - (ntuple-example-read) +(defun ntuple-example-make-read () + "Create an ntuple historgram example data file, and read it." + (make-ntuple-example-data) + (ntuple-example-read)) + +(save-test + ntuple + (ntuple-example-make-read) (ntuple-example-histogramming)) diff --git a/tests/ntuple.lisp b/tests/ntuple.lisp index b7180b2f..aa78c306 100644 --- a/tests/ntuple.lisp +++ b/tests/ntuple.lisp @@ -1,6 +1,6 @@ ;; Regression test NTUPLE for GSLL, automatically generated ;; -;; Copyright 2009 Liam M. Healy +;; Copyright 2009, 2011 Liam M. Healy ;; Distributed under the terms of the GNU General Public License ;; ;; This program is free software: you can redistribute it and/or modify @@ -19,6 +19,6 @@ (in-package :gsl) (LISP-UNIT:DEFINE-TEST NTUPLE - (LISP-UNIT:ASSERT-true (NTUPLE-EXAMPLE-READ)) + (LISP-UNIT:ASSERT-true (NTUPLE-EXAMPLE-make-READ)) (LISP-UNIT:ASSERT-true (NTUPLE-EXAMPLE-HISTOGRAMMING))) -- GitLab