From 0315e1043a84726f0c291730eed888ffcf4c6c00 Mon Sep 17 00:00:00 2001 From: AJ Rossini Date: Wed, 11 Jul 2007 09:32:05 +0200 Subject: [PATCH] always need to import lisp-stat-math when need to vectorize math functions --- linalg.lsp | 8 ++++++++ nonlin.lsp | 15 +++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/linalg.lsp b/linalg.lsp index d06f796..bce7e80 100644 --- a/linalg.lsp +++ b/linalg.lsp @@ -27,8 +27,16 @@ (defpackage :lisp-stat-linalg (:use :common-lisp + :lisp-stat-math :lisp-stat-types :lisp-stat-matrix) + (:shadowing-import-from :lisp-stat-math + expt + - * / ** mod rem abs 1+ 1- log exp sqrt sin cos tan + asin acos atan sinh cosh tanh asinh acosh atanh float random + truncate floor ceiling round minusp zerop plusp evenp oddp + < <= = /= >= > complex conjugate realpart imagpart phase + min max logand logior logxor lognot ffloor fceiling + ftruncate fround signum cis) (:export chol-decomp lu-decomp lu-solve determinant inverse sv-decomp qr-decomp rcondest make-rotation spline kernel-dens kernel-smooth fft make-sweep-matrix sweep-operator ax+y eigen)) diff --git a/nonlin.lsp b/nonlin.lsp index 2ad3e6e..0449616 100644 --- a/nonlin.lsp +++ b/nonlin.lsp @@ -5,7 +5,6 @@ ;;; Since 1991, ANSI was finally finished. Modified to match ANSI ;;; Common Lisp. - ;;;; XLISP-STAT 2.1 Copyright (c) 1990, by Luke Tierney ;;;; Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz ;;;; You may give out copies of this software; for conditions see the file @@ -23,14 +22,22 @@ :lisp-stat-regression-linear) (:shadowing-import-from :lisp-stat-object-system slot-value call-method call-next-method) + (:shadowing-import-from :lisp-stat-math + expt + - * / ** mod rem abs 1+ 1- log exp sqrt sin cos tan + asin acos atan sinh cosh tanh asinh acosh atanh float random + truncate floor ceiling round minusp zerop plusp evenp oddp + < <= = /= >= > complex conjugate realpart imagpart phase + min max logand logior logxor lognot ffloor fceiling + ftruncate fround signum cis) + (:export nreg-model nreg-model-proto mean-function theta-hat epsilon count-limit verbose)) (in-package :lisp-stat-regression-nonlin) -;;;; -;;;; Nonlinear Regression Model Prototype -;;;; +;;; +;;; Nonlinear Regression Model Prototype +;;; (defproto nreg-model-proto '(mean-function theta-hat epsilon count-limit verbose) -- 2.11.4.GIT