Changeset 835

Timestamp:

10/15/15 18:41:35 (7 months ago)

Author:

mmckerns

Message:

use LinearKernel? in test_svr1 example; enable use of numpy.poly1d as cost;
enable mystic.log_reader to read Monitor instance

Location:

mystic

Files:

• examples/test_svc1.py (modified) (1 diff)
• examples/test_svc2.py (modified) (1 diff)
• examples/test_svr1.py (modified) (1 diff)
• mystic/abstract_solver.py (modified) (2 diffs)
• mystic/scripts.py (modified) (4 diffs)

mystic/examples/test_svc1.py

@@ -30 +30 @@
 y = concatenate([ones(c1.shape[0]), -ones(c2.shape[0])]).reshape(1,nx)
 
-# build the Kernel Matrix (with the linear kernel)
+# build the Kernel Matrix
 # get the QP quadratic and linear terms
 XX = concatenate([c1,-c2])

mystic/examples/test_svc2.py

@@ -42 +42 @@
 y = concatenate([ones(c1.shape[0]), -ones(c2.shape[0])]).reshape(1,nx)
 
-# build the Kernel Matrix (with the linear kernel)
+# build the Kernel Matrix
 # get the QP quadratic and linear terms
 XX = concatenate([c1,-c2])

mystic/examples/test_svr1.py

@@ -27 +27 @@
 # get the QP quadratic term
 X = concatenate([x,-x])
-Q = 1 + multiply.outer(X,X)
+Q = KernelMatrix(X, LinearKernel)
 # get the QP linear term
 Y = concatenate([y,-y])

mystic/mystic/abstract_solver.py

@@ -596 +596 @@
         _cost,_raw,_args = self._cost
         # check if need to 'wrap' or can return the stored cost
-        if cost in [None, _raw, _cost] and ExtraArgs in [None, _args]:
+        if (cost is None or cost is _raw or cost is _cost) and \
+           (ExtraArgs is None or ExtraArgs is _args):
             return
         # get cost and args if None was given
@@ -651 +652 @@
         _cost,_raw,_args = self._cost
         # check if need to 'wrap' or can return the stored cost
-        if cost in [None, _raw, _cost] and ExtraArgs in [None, _args] \
-           and self._live:
+        if (cost is None or cost is _raw or cost is _cost) and \
+           (ExtraArgs is None or ExtraArgs is _args) and self._live:
             return _cost
         # 'wrap' the 'new' cost function with _decorate

mystic/mystic/scripts.py

@@ -674 +674 @@
     __quit = False
 
+    instance = None
     # handle the special case where list is provided by sys.argv
     if isinstance(filename, (list,tuple)) and not kwds:
@@ -698 +699 @@
         cmdargs += '' if nid is None else '--nid={} '.format(nid)
         cmdargs += '' if param is None else '--param="{}" '.format(param)
-        cmdargs = filename.split() + shlex.split(cmdargs)
+        if isinstance(filename, basestring):
+            cmdargs = filename.split() + shlex.split(cmdargs)
+        else: # special case of passing in monitor instance
+            instance = filename
+            cmdargs = ['^1203@magic*key311&'] + shlex.split(cmdargs)
 
     #XXX: note that 'argparse' is new as of python2.7
@@ -757 +762 @@
 
     try: # get logfile name
-      filename = parsed_args[0]
+      if instance:
+        filename = instance
+      else:
+        filename = parsed_args[0]
     except:
       raise IOError("please provide log file name")
@@ -804 +812 @@
     # parse file contents to get (i,id), cost, and parameters
     try:
-        step, param, cost = logfile_reader(filename)
+        if instance:
+            step = enumerate(instance.id)
+            if len(instance) == instance.id.count(None):
+                step = [(i,) for (i,j) in step]
+            else:
+                step = list(step)
+            param, cost = instance.x, instance.y
+        else:
+            step, param, cost = logfile_reader(filename)
     except SyntaxError:
         read_raw_file(filename)