### wip...

parent 579da771
 ... @@ -260,7 +260,7 @@ def analyse(problem, niter=1000, show_progress=False): ... @@ -260,7 +260,7 @@ def analyse(problem, niter=1000, show_progress=False): wproblem = problem.copy() wproblem = problem.copy() wproblem.targets = wtargets wproblem.targets = wtargets xbounds = num.array(wproblem.bounds(), dtype=num.float) xbounds = num.array(wproblem.get_parameter_bounds(), dtype=num.float) npar = xbounds.shape[0] npar = xbounds.shape[0] mss = num.zeros((niter, wproblem.ntargets)) mss = num.zeros((niter, wproblem.ntargets)) ... @@ -358,7 +358,7 @@ def solve(problem, ... @@ -358,7 +358,7 @@ def solve(problem, compensate_excentricity=True, compensate_excentricity=True, status=()): status=()): xbounds = num.array(problem.bounds(), dtype=num.float) xbounds = num.array(problem.get_parameter_bounds(), dtype=num.float) npar = xbounds.shape[0] npar = xbounds.shape[0] nlinks_cap = int(round(chain_length_factor * npar + 1)) nlinks_cap = int(round(chain_length_factor * npar + 1)) ... @@ -832,7 +832,7 @@ def check( ... @@ -832,7 +832,7 @@ def check( check_problem(problem) check_problem(problem) xbounds = num.array(problem.bounds(), dtype=num.float) xbounds = num.array(problem.get_parameter_bounds(), dtype=num.float) results_list = [] results_list = [] ... ...
 ... @@ -168,7 +168,7 @@ def draw_sequence_figures(model, plt, misfit_cutoff=None, sort_by='iteration'): ... @@ -168,7 +168,7 @@ def draw_sequence_figures(model, plt, misfit_cutoff=None, sort_by='iteration'): problem = model.problem problem = model.problem imodels = num.arange(model.nmodels) imodels = num.arange(model.nmodels) bounds = problem.bounds() + problem.dependant_bounds() bounds = problem.get_parameter_bounds() + problem.get_dependant_bounds() xref = problem.pack(problem.base_source) xref = problem.pack(problem.base_source) ... @@ -337,7 +337,7 @@ def draw_jointpar_figures( ... @@ -337,7 +337,7 @@ def draw_jointpar_figures( xs = model.xs xs = model.xs bounds = problem.bounds() + problem.dependant_bounds() bounds = problem.get_parameter_bounds() + problem.get_dependant_bounds() for ipar in xrange(problem.ncombined): for ipar in xrange(problem.ncombined): par = problem.combined[ipar] par = problem.combined[ipar] lo, hi = bounds[ipar] lo, hi = bounds[ipar] ... @@ -347,7 +347,7 @@ def draw_jointpar_figures( ... @@ -347,7 +347,7 @@ def draw_jointpar_figures( exclude.append(par.name) exclude.append(par.name) xref = problem.pack(problem.base_source) xref = problem.get_xref() if ibootstrap is not None: if ibootstrap is not None: gms = problem.bootstrap_misfits(model.misfits, ibootstrap) gms = problem.bootstrap_misfits(model.misfits, ibootstrap) ... ...