Commit 0b408437 by Liam M. Healy

Move symbol shadowing

Move symbol shadowing in antik-user out of GSLL to Antik (physical-dimension).
parent 6f2ef048
;; Definition of GSLL system
;; Liam Healy
;; Time-stamp: <2012-02-05 16:50:51EST gsll.asd>
;; Time-stamp: <2013-11-24 19:18:07EST gsll.asd>
;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013 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
......@@ -28,7 +28,7 @@
:author "Liam M. Healy"
:licence "GPL v3"
:defsystem-depends-on (#:cffi-grovel #:asdf-system-connections)
:depends-on (#:antik
:depends-on (#:foreign-array
#:cffi-grovel
#:trivial-garbage
#:alexandria
......
;; Load GSL
;; Liam Healy Sat Mar 4 2006 - 18:53
;; Time-stamp: <2012-02-19 10:35:34EST init.lisp>
;; Time-stamp: <2013-11-24 19:08:18EST init.lisp>
;;
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013 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
......@@ -18,17 +18,13 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(in-package :cl-user)
(defpackage gsll
(:nicknames :gsl)
(:use :common-lisp :cffi)
(:import-from :grid #:dim0 #:dim1 #:^ #:copy)
(:export #:dim0 #:dim1 #:copy)
;; No actual conflict due to different usage of symbols:
;; antik:psi means "pounds per square inch" vs. function #'gsl:psi
;; antik:knots means "nautical miles per hour" vs. function #'gsl:knots
;; antik:acceleration refers to the time derivative of velocity vs. object 'gsl:acceleration.
;; si units symbol-macro vs. GSLL's sine integral.
(:shadowing-import-from :antik #:psi #:knots #:si))
(:export #:dim0 #:dim1 #:copy))
(setf
antik::*antik-user-shadow-symbols*
......@@ -40,10 +36,16 @@
grid:column ; GSLL alternate is equivalent
iterate:sum ; GSLL histogram function, both pretty obscure
iterate:multiply ; GSLL function duplicates '*
antik:polar-to-rectangular ; GSLL's doesn't use vectors
antik:rectangular-to-polar ; GSLL's doesn't use vectors
antik:acceleration
;;antik:polar-to-rectangular ; GSLL's doesn't use vectors
;;antik:rectangular-to-polar ; GSLL's doesn't use vectors
;;antik:acceleration
;; taken from GSLL
;; No actual conflict due to different usage of symbols:
;; antik:psi means "pounds per square inch" vs. function #'gsl:psi
;; antik:knots means "nautical miles per hour" vs. function #'gsl:knots
;; antik:acceleration refers to the time derivative of velocity vs. object 'gsl:acceleration.
;; si units symbol-macro vs. GSLL's sine integral.
;;(:shadowing-import-from :antik #:psi #:knots #:si)
gsll::iterate ; conflict with iterate:iterate, but iterate:iter is a synonym
))
antik::*antik-user-use-packages*
......
;; Dimensioned physical constants.
;; Liam Healy 2013-02-24 00:28:51EST dimensioned.lisp
;; Time-stamp: <2013-02-24 00:45:33EST dimensioned.lisp>
;;
;; Copyright 2013 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
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(in-package :gsl)
(export '(speedoflight gravitationalconstant planckh planckhbar))
(define-physical-constant speedoflight (make-pq +mksa-speed-of-light+ "m/s"))
(define-physical-constant gravitationalconstant (make-pq +mksa-gravitational-constant+ "m^3/kg-s^2"))
(define-physical-constant planckh (make-pq +mksa-plancks-constant-h+ "m^2-kg/s"))
(define-physical-constant planckhbar (make-pq +mksa-plancks-constant-hbar+ "m^2-kg/s"))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment