Changeset 840

Timestamp:

10/27/15 11:21:32 (7 months ago)

Author:

mmckerns

Message:

moved svmtools to svr, svctools to svc; fixed VTR documentation

Location:

mystic

Files:

• examples/test_svc1.py (modified) (1 diff)
• examples/test_svc2.py (modified) (1 diff)
• examples/test_svr1.py (modified) (1 diff)
• examples/test_svr2.py (modified) (1 diff)
• examples_other/qld_svc1.py (modified) (1 diff)
• examples_other/qld_svc2.py (modified) (1 diff)
• examples_other/qld_svr1.py (modified) (1 diff)
• examples_other/qld_svr2.py (modified) (1 diff)
• mystic/svc.py (moved) (moved from mystic/mystic/svctools.py) (1 diff)
• mystic/svr.py (moved) (moved from mystic/mystic/svmtools.py)
• mystic/termination.py (modified) (2 diffs)

mystic/examples/test_svc1.py

@@ -12 +12 @@
 from numpy import *
 import pylab
-from mystic.svctools import *
+from mystic.svc import *
 
 # define the objective function to match standard QP solver

mystic/examples/test_svc2.py

@@ -14 +14 @@
 from numpy import *
 import pylab
-from mystic.svctools import *
+from mystic.svc import *
 import os.path
 

mystic/examples/test_svr1.py

@@ -12 +12 @@
 from numpy import *
 import pylab
-from mystic.svmtools import *
+from mystic.svr import *
 
 # define the objective function to match standard QP solver

mystic/examples/test_svr2.py

@@ -12 +12 @@
 from numpy import *
 import pylab
-from mystic.svmtools import *
+from mystic.svr import *
 
 # define the objective function to match standard QP solver

mystic/examples_other/qld_svc1.py

@@ -12 +12 @@
 import qld, quapro
 import pylab
-from mystic.svctools import *
+from mystic.svc import *
 
 def myshow():

mystic/examples_other/qld_svc2.py

@@ -14 +14 @@
 import qld, quapro
 import pylab
-from mystic.svctools import *
+from mystic.svc import *
 import os.path, time
 

mystic/examples_other/qld_svr1.py

@@ -12 +12 @@
 import qld
 import pylab
-from mystic.svmtools import *
+from mystic.svr import *
 
 from mystic.tools import random_seed

mystic/examples_other/qld_svr2.py

@@ -12 +12 @@
 import qld
 import pylab
-from mystic.svmtools import *
+from mystic.svr import *
 
 x = arange(-5, 5.001)

mystic/mystic/svc.py

@@ -53 +53 @@
 If labels y are provided, then group indicies by label
     """
-    import mystic.svmtools as svm
-    sv = svm.SupportVectors(alpha,eps)
+    import mystic.svr as svr
+    sv = svr.SupportVectors(alpha,eps)
     if y is None:
         return sv

mystic/mystic/termination.py

@@ -137 +137 @@
 # Factories that give termination conditions
 def VTR(tolerance=0.005, target=0.0):
-    """cost of last iteration is < tolerance:
-
-cost[-1] <= tolerance"""
+    """cost of last iteration is < tolerance from target:
+
+abs(cost[-1] - target) <= tolerance"""
     doc = "VTR with %s" % {'tolerance':tolerance, 'target':target}
     def _VTR(inst, info=False):
@@ -262 +262 @@
 def VTRChangeOverGeneration(ftol=0.005, gtol=1e-6, generations=30, target=0.0):
     """change in cost is < gtol over a number of generations,
-or cost of last iteration is < ftol:
-
-cost[-g] - cost[-1] <= gtol, where g=generations *or* cost[-1] <= ftol."""
+or cost of last iteration is < ftol from target:
+
+cost[-g] - cost[-1] <= gtol *or* abs(cost[-1] - target) <= ftol."""
     doc = "VTRChangeOverGeneration with %s" % {'ftol':ftol, 'gtol':gtol,
                                                'generations':generations,