Changeset 125

Timestamp:

03/24/09 13:00:13 (7 years ago)

Author:

mmckerns

Message:

added authors, license, copyright, and etc information

Files:

• Makefile (modified) (2 diffs)
• mystic/mystic/__init__.py (modified) (2 diffs)
• mystic/mystic/scemtools.py (modified) (2 diffs)
• mystic/setup.py (modified) (1 diff)

Makefile

@@ -1 +1 @@
 #---------------------------------------------------
-SOURCES = 
+VERSION = 0.1a1
 #---------------------------------------------------
 
@@ -7 +7 @@
 doc:
         epydoc --config mystic.epydoc
-        mv -f shared,opt html
+        mkdir html
+        mv -f shared,opt html/mystic-${VERSION}
 
 clean:

mystic/mystic/__init__.py

@@ -115 +115 @@
 Solvers are found here::
     `mystic.mystic.differential_evolution`, `mystic.mystic.scipy_optimize`
+
+See http://dev.danse.us/trac/mystic for more information.
 """
 __version__ = '0.1a1'
-__author__ = 'Patrick Hung & Mike McKerns'
+__author__ = 'Mike McKerns, Patrick Hung'
+
+__license__ = """
+This software is part of the open-source DANSE project at the California
+Institute of Technology, and is available subject to the conditions and
+terms laid out below. By downloading and using this software you are
+agreeing to the following conditions.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met::
+
+    - Redistribution of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    - Redistribution in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentations and/or other materials provided with the distribution.
+
+    - Neither the name of the California Institute of Technology nor
+      the names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 2009 California Institute of Technology. All rights reserved.
+
+
+If you use this software to do productive scientific research that leads to
+publication, we ask that you acknowledge use of the software by citing the
+following paper in your publication::
+
+    "mystic: a simple model-independent inversion framework",
+     Michael McKerns, Patrick Hung, and Michael Aivazis, unpublished;
+     http://dev.danse.us/trac/mystic
+
+"""
 
 # solvers
@@ -129 +178 @@
 from tools import *
 
+def copyright():
+    """print copyright and reference"""
+    print __license__[-439:]
+    return
+
 # end of file

mystic/mystic/scemtools.py

@@ -12 +12 @@
 uncertainty assessment of hydrologic model parameters,
 WATER RESOURCES RESEARCH, VOL. 39, NO. 8, 1201, doi:10.1029/2002WR001642, 2003 
-Link: http://www.agu.org/pubs/crossref/2003/2002WR001642.shtml
+http://www.agu.org/pubs/crossref/2003/2002WR001642.shtml
 
 [2] Vrugt JA, Nuallain , Robinson BA, Bouten W, Dekker SC, Sloot PM
@@ -18 +18 @@
 environmental models,
 Computers & Geosciences, Vol. 32, No. 8. (October 2006), pp. 1139-1155.
-Link: http://www.science.uva.nl/research/scs/papers/archive/Vrugt2006b.pdf
+http://www.science.uva.nl/research/scs/papers/archive/Vrugt2006b.pdf
 
 """

mystic/setup.py

@@ -14 +14 @@
     name="mystic",
     version="0.1a1",
-    author="Patrick Hung & Mike McKerns"
+    author="Mike McKerns, Patrick Hung"
     maintainer="Mike McKerns",
     maintainer_email="mmckerns@caltech.edu",