Changeset 374

Timestamp:

08/04/10 17:47:48 (6 years ago)

Author:

mmckerns

Message:

moved multilogger code to scripts;
log_reader can stop at desired iteration

Files:

• Makefile (modified) (1 diff)
• branches/dummy (added)
• branches/dummy/__init__.py (added)
• branches/multilogger (deleted)
• mystic/Make.mm (modified) (1 diff)
• mystic/scripts (added)
• mystic/scripts/Make.mm (added)
• mystic/scripts/mystic_log_reader.py (copied) (copied from branches/multilogger/log_reader.py) (3 diffs)
• mystic/scripts/newoldsupport.py (copied) (copied from branches/multilogger/newoldsupport.py)
• mystic/scripts/support_convergence.py (copied) (copied from branches/multilogger/support_convergence.py)
• mystic/scripts/support_hypercube.py (copied) (copied from branches/multilogger/support_hypercube.py)
• mystic/scripts/support_hypercube2.py (copied) (copied from branches/multilogger/support_hypercube2.py)
• mystic/setup.py (modified) (1 diff)
• mystic/tests/Make.mm (modified) (1 diff)

Makefile

@@ -7 +7 @@
 doc:
         cp -rf mystic/_math mystic/math
+        cp -f branches/dummy/__init__.py mystic/scripts
         epydoc --config mystic.epydoc
         rm -rf mystic/math
+        rm -f mystic/scripts/__init__.py
         mkdir html
         mv -f shared,mpi html/mystic-${VERSION}

mystic/Make.mm

@@ -7 +7 @@
     models \
     _math \
+    scripts \
 
 OTHER_DIRS = \

mystic/scripts/mystic_log_reader.py

@@ +1 @@
+#!/usr/bin/env python
+__doc__ = """
+plot parameter convergence from file written with 'LoggingSow'
+
+Usage: python log_reader.py [filename] [maxiter]
+    [filename] - name of the convergence logfile (e.g log.txt)
+    [maxiter] - the largest iteration to plot (from 1 to maxiter) [optional]
+"""
 import sys
+if '--help' in sys.argv:
+  print __doc__
+  sys.exit(0)
+
 if '--dots' in sys.argv:
   mark = 'o'
@@ -6 +18 @@
   mark = ''
 
-try:
+try: # get logfile name
   filename = sys.argv[1]
 except:
   filename = 'log.txt'
+
+try: # select which iteration to stop plotting at
+  stop = int(sys.argv[2])
+except:
+  stop = None
 
 f = open(filename,"r")
@@ -44 +61 @@
     cost.append(eval(values[1]))
     param.append(eval(values[2]))
+
+# ignore everything after 'stop'
+step = step[:stop]
+cost = cost[:stop]
+param = param[:stop]
 
 # split (i,id) into iteration and id

mystic/setup.py

@@ -44 +44 @@
 setup_code += """    
       zip_safe=True,
-      scripts=[])
+"""
+
+# add the scripts, and close 'setup' call
+setup_code += """
+    scripts=['scripts/mystic_log_reader.py',
+             'scripts/support_convergence.py',
+             'scripts/support_hypercube.py',
+             'scripts/support_hypercube2.py'])
 """
 

mystic/tests/Make.mm

@@ -5 +5 @@
 PACKAGE = tests
 
-PROJ_CLEAN += $(PROJ_CPPTESTS) log1.py log2.py
+PROJ_CLEAN += $(PROJ_CPPTESTS) log1.py log2.py log.txt paramlog*.py 
 
 PROJ_PYTESTS =