Changeset 127

Timestamp:

03/26/09 11:24:54 (7 years ago)

Author:

mmckerns

Message:

renamed some examples to better conform to 'examples' naming convention

Location:

mystic

Files:

• ABOUT-MYSTIC.txt (modified) (2 diffs)
• NOTES (modified) (2 diffs)
• README (modified) (1 diff)
• examples/Make.mm (modified) (1 diff)
• examples/derun.py (modified) (2 diffs)
• examples/dummy.py (moved) (moved from mystic/examples/example.py) (1 diff)
• examples/rosetta_mogi.py (moved) (moved from mystic/examples/rosetta_mogi_example.py)
• examples/rosetta_parabola.py (moved) (moved from mystic/examples/rosetta_parabola_example.py)
• examples/test_getCost.py (moved) (moved from mystic/examples/example_getCost.py) (1 diff)

mystic/ABOUT-MYSTIC.txt

@@ -51 +51 @@
   < optimizer interface: slide #10 >
 
-Mystic's Interface:  (see MYSTIC-EXAMPLE.txt) -> uses example_getCost.py
+Mystic's Interface:  (see MYSTIC-EXAMPLE.txt) -> uses test_getCost.py
  * Model Factory Interface
  * Cost Function Generation
@@ -71 +71 @@
 
 -------------------------------------------------------------
-== Example 1: simple parabola == (examples/example_getCost.py) == 
+== Example 1: simple parabola == (examples/test_getCost.py) == 
 - very simple forward model
 - highlights several configuration options (esp. SetStrictRanges)

mystic/NOTES

@@ -12 +12 @@
 
  o mystic.derun => an optimization framework pyre application [NEEDS WORK!]
- * mystic.example => Chebyshev8 cost function
+ * mystic.dummy => Chebyshev8 cost function
 
  * mystic.differential_evolution => Price & Storn's DE solver
@@ -35 +35 @@
      . factory.addModel()
      . factory.getCostFunction[Slow]()
- o mystic.example_getCost => example usage of CostFactory [NEEDS WORK!]
+ o mystic.test_getCost => example usage of CostFactory [NEEDS WORK!]
    - SIMPLE example: User-prepared cost function
    - SIMPLE example: CostFactory-built cost function

mystic/README

@@ -19 +19 @@
 Notes on the "ffit" tests/examples:
  - test_ffit: The fitting problem whose exact solution is 8th order Chebyshev polynomial of the first kind.  This example uses a Ctrl-C signal handler. Try ctrl-c as the differential_evolution strategy is running.
+ - test_ffit2: The fitting problem whose exact solution is 16th order Chebyshev polynomial of the first kind.  Also uses the signal_handler. 
+ - test_ffitB: Same as test_ffit.py, but uses DifferentialEvolutionSolver2 instead of DifferentialEvolutionSolver. 
+ - test_ffitC: Same as test_ffit.py, but uses scipy_optimize.fmin.
+ - test_ffitD: Same as test_ffit.py, but uses scipy_optimize.diffev.
+
 
 Notes on the "mogi" tests/examples:

mystic/examples/Make.mm

@@ -69 +69 @@
     test_wavy.py \
 ##  derun.py \
-##  example.py \
-    example_getCost.py \
+##  dummy.py \
+    test_getCost.py \
     forward_model.py \
-    rosetta_parabola_example.py \
-    rosetta_mogi_example.py \
+    rosetta_parabola.py \
+    rosetta_mogi.py \
     example01.py \
     example02.py \

mystic/examples/derun.py

@@ -34 +34 @@
         probability.meta['tip'] = 'Differential Evolution crossover probability.'
 
-        costfunc = pyre.inventory.str('costfunc', default = 'example')
+        costfunc = pyre.inventory.str('costfunc', default = 'dummy')
         costfunc.meta['tip'] = 'The python module containing the cost-function and other data.'
 
@@ -117 +117 @@
     app.run()
 
-    # Chebyshev8 polynomial (used with "example.py")
+    # Chebyshev8 polynomial (used with "dummy.py")
     from mystic.models.poly import chebyshev8coeffs as target_coeffs
     from mystic.models.poly import poly1d

mystic/examples/dummy.py

@@ -10 +10 @@
 
 """
-example.py
+dummy.py -- cost function container module for derun.py
 """
 

mystic/examples/test_getCost.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """
-example_getCost.py
+test_getCost.py
 Example to demonstrate use of CostFactory
 """