DFO-LS 1.5.3__tar.gz → 1.5.4__tar.gz

{dfo_ls-1.5.3 → dfo_ls-1.5.4}/DFO_LS.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: DFO-LS
-Version: 1.5.3
+Version: 1.5.4
 Summary: A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization
 Author-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
 Maintainer-email: Lindon Roberts <lindon.roberts@sydney.edu.au>

{dfo_ls-1.5.3 → dfo_ls-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: DFO-LS
-Version: 1.5.3
+Version: 1.5.4
 Summary: A flexible derivative-free solver for (bound constrained) nonlinear least-squares minimization
 Author-email: Lindon Roberts <lindon.roberts@sydney.edu.au>
 Maintainer-email: Lindon Roberts <lindon.roberts@sydney.edu.au>

{dfo_ls-1.5.3 → dfo_ls-1.5.4}/dfols/__init__.py

@@ -39,9 +39,9 @@ alternative licensing.
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 # DFO-LS version
-__version__ = '1.5.3'
+__version__ = '1.5.4'
 
 # Main solver & exit flags
 from .solver import *
-__all__ = ['solve']
+__all__ = ['solve', 'OptimResults']
 

{dfo_ls-1.5.3 → dfo_ls-1.5.4}/dfols/solver.py

@@ -32,6 +32,7 @@ import logging
 from math import sqrt
 import numpy as np
 import os
+import pandas as pd
 import scipy.linalg as LA
 import scipy.stats as STAT
 import warnings
@@ -41,7 +42,7 @@ from .diagnostic_info import *
 from .params import *
 from .util import *
 
-__all__ = ['solve']
+__all__ = ['solve', 'OptimResults']
 
 module_logger = logging.getLogger(__name__) 
 
@@ -92,12 +93,60 @@ class OptimResults(object):
             if self.diagnostic_info is not None:
                 output += "Diagnostic information available; check self.diagnostic_info\n"
             output += "Solution xmin was evaluation point %g\n" % self.xmin_eval_num
-            if len(self.jacmin_eval_nums) < 100:
+            if self.jacmin_eval_nums is not None and len(self.jacmin_eval_nums) < 100:
                 output += "Approximate Jacobian formed using evaluation points %s\n" % str(self.jacmin_eval_nums)
+            elif self.jacmin_eval_nums is None:
+                output += "Approximate Jacobian not formed using problem information, disregard\n"
+            else:
+                output += "Not showing Jacobian evaluation points because it is too long; check self.jacmin_eval_nums\n"
         output += "Exit flag = %g\n" % self.flag
         output += "%s\n" % self.msg
         output += "****************************\n"
         return output
+    
+    def to_dict(self, replace_nan=True):
+        # Convert to a serializable dict object suitable for saving in a json file
+        # If replace_nan=True, convert all NaN entries to None
+        soln_dict = {}
+        soln_dict['x'] = self.x.tolist() if self.x is not None else None
+        soln_dict['resid'] = self.resid.tolist() if self.resid is not None else None
+        soln_dict['obj'] = float(self.obj)
+        soln_dict['jacobian'] = self.jacobian.tolist() if self.jacobian is not None else None
+        soln_dict['nf'] = int(self.nf)
+        soln_dict['nx'] = int(self.nx)
+        soln_dict['nruns'] = int(self.nruns)
+        soln_dict['flag'] = int(self.flag)
+        soln_dict['msg'] = str(self.msg)
+        soln_dict['diagnostic_info'] = self.diagnostic_info.to_dict() if self.diagnostic_info is not None else None
+        soln_dict['xmin_eval_num'] = int(self.xmin_eval_num)
+        soln_dict['jacmin_eval_nums'] = self.jacmin_eval_nums.tolist() if self.jacmin_eval_nums is not None else None
+        if replace_nan:
+            return replace_nan_with_none(soln_dict)
+        else:
+            return soln_dict
+    
+    @staticmethod
+    def from_dict(soln_dict):
+        # Take a dict object containing OptimResults information, and return the relevant OptimResults object
+        # Input soln_dict should come from soln.to_dict()
+        # Note: np.array(mylist, dtype=float) automatically converts None to NaN
+        x = np.array(soln_dict['x'], dtype=float) if soln_dict['x'] is not None else None
+        resid = np.array(soln_dict['resid'], dtype=float) if soln_dict['resid'] is not None else None
+        obj = soln_dict['obj']
+        jacobian = np.array(soln_dict['jacobian'], dtype=float) if soln_dict['jacobian'] is not None else None
+        nf = soln_dict['nf']
+        nx = soln_dict['nx']
+        nruns = soln_dict['nruns']
+        flag = soln_dict['flag']
+        msg = soln_dict['msg']
+        xmin_eval_num = soln_dict['xmin_eval_num']
+        jacmin_eval_nums = np.array(soln_dict['jacmin_eval_nums'], dtype=int) if soln_dict['jacmin_eval_nums'] is not None else None
+        
+        soln = OptimResults(x, resid, obj, jacobian, nf, nx, nruns, flag, msg, xmin_eval_num, jacmin_eval_nums)
+        
+        if soln_dict['diagnostic_info'] is not None:
+            soln.diagnostic_info = pd.DataFrame.from_dict(soln_dict['diagnostic_info'])
+        return soln
 
 
 def solve_main(objfun, x0, argsf, xl, xu, projections, npt, rhobeg, rhoend, maxfun, nruns_so_far, nf_so_far, nx_so_far, nsamples, params,

{dfo_ls-1.5.3 → dfo_ls-1.5.4}/dfols/util.py

@@ -26,13 +26,14 @@ alternative licensing.
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import logging
+import math
 import numpy as np
 import scipy.linalg as LA
 import sys
 
 
 __all__ = ['sumsq', 'eval_least_squares_with_regularisation', 'model_value', 'random_orthog_directions_within_bounds',
-           'random_directions_within_bounds', 'apply_scaling', 'remove_scaling', 'pbox', 'pball', 'dykstra', 'qr_rank']
+           'random_directions_within_bounds', 'apply_scaling', 'remove_scaling', 'pbox', 'pball', 'dykstra', 'qr_rank', 'replace_nan_with_none']
 
 module_logger = logging.getLogger(__name__) 
 
@@ -268,3 +269,15 @@ def qr_rank(A,tol=1e-15):
     D = np.abs(np.diag(R))
     rank = np.sum(D > tol) 
     return rank, D
+
+
+def replace_nan_with_none(d):
+    # Replace Nan values in a dict/list with None (used for JSON serializing of OptimResults object)
+    if isinstance(d, dict):
+        return {k: replace_nan_with_none(v) for k, v in d.items()}
+    elif isinstance(d, list):
+        return [replace_nan_with_none(i) for i in d]
+    elif isinstance(d, float) and math.isnan(d):
+        return None
+    else:
+        return d