Changeset 129

Timestamp:

03/27/09 14:32:08 (7 years ago)

Author:

mmckerns

Message:

added releases branch;
added a bit more doc to example12;
modified setup.py to work with setuptools

Files:

• mystic/examples/example12.py (modified) (4 diffs)
• mystic/setup.py (modified) (2 diffs)
• releases (added)

mystic/examples/example12.py

@@ -53 +53 @@
     return x,y
 
+# draw the plot
+def plot_frame(label=None):
+    pylab.close()
+    pylab.suptitle("fitting noisy 5th-order polynomial coefficients")
+    pylab.xlabel("x")
+    pylab.ylabel("f(x)")
+    return
+ 
 # plot the polynomial
 def plot_data(evalpts,datapts,style='k.'):
@@ -62 +70 @@
     x,y = data(params)
     plot_data(x,y,style)
+    pylab.legend(["Data","Fitted"])
     return
 
@@ -77 +86 @@
     x,datapts = noisy_data(target)
 
-    # plot observed and target data
+    # plot observed data
+    plot_frame()
     plot_data(x,datapts)
-    plot_solution(target)
 
     # generate cost function
@@ -92 +101 @@
  
     # plot solution versus target coefficients
-    plot_solution(solution,'r-')
+    plot_solution(solution)
     getch() 
 

mystic/setup.py

@@ -1 +1 @@
 #!/usr/bin/env python
 #
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#                       Patrick Hung & Mike McKerns, Caltech
-#                        (C) 1998-2009  All Rights Reserved
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
+# Michael McKerns
+# mmckerns@caltech.edu
 
-from distutils.core import setup
+# check if easy_install is available
+try:
+#   import __force_distutils__ #XXX: uncomment to force use of distutills
+    from setuptools import setup
+    has_setuptools = True
+except ImportError:
+    from distutils.core import setup
+    has_setuptools = False
 
-setup(
-    name="mystic",
-    version="0.1a1",
-    author="Mike McKerns, Patrick Hung"
-    maintainer="Mike McKerns",
-    maintainer_email="mmckerns@caltech.edu",
-    license="BSD",
-    platforms=["any"],
-    description="Interactive Inversion Analysis Framework",
-    classifiers=(
-        "Intended Audience :: Developers",
-        "Programming Language :: Python",
-        "Development Status :: 2 - Pre-Alpha",
-        "Topic :: Physics Programming"),
+# build the 'setup' call
+setup_code = """
+setup(name='mystic',
+      version='0.1a1',
+      description='a simple interactive inversion analysis framework',
+      author = 'Mike McKerns, Patrick Hung',
+      maintainer = 'Mike McKerns',
+      maintainer_email = 'mmckerns@caltech.edu',
+      license = 'BSD',
+      platforms = ['any'],
+      url = 'http://mmckerns.github.io/~mmckerns',
+      classifiers = ('Intended Audience :: Developers',
+                     'Programming Language :: Python',
+                     'Development Status :: 2 - Pre-Alpha',
+                     'Topic :: Physics Programming'),
 
-    packages=['mystic','mystic.models'],
-    package_dir={'mystic':'mystic','mystic.models':'models'},
+      packages = ['mystic','mystic.models'],
+      package_dir = {'mystic':'mystic','mystic.models':'models'},
+"""
 
-    scripts=[])
+# add dependencies
+numpy_version = '>=1.0'
+matplotlib_version = '>=0.91'
+if has_setuptools:
+    setup_code += """
+      install_requires = ('numpy%s'),
+""" % numpy_version
+
+# close 'setup' call
+setup_code += """    
+      scripts=[])
+"""
+
+# exec the 'setup' code
+exec setup_code
+
+# if dependencies are missing, print a warning
+try:
+    import numpy
+    import matplotlib
+except ImportError:
+    print "\n***********************************************************"
+    print "WARNING: One of the following dependencies is unresolved:"
+    print "    numpy %s" % numpy_version
+    print "    matplotlib %s (optional)" % matplotlib_version
+    print "***********************************************************\n"
 
 
@@ -35 +64 @@
     pass
 
-# End of file
+# end of file