Commit 11851725 authored by Marius Isken's avatar Marius Isken
Browse files

wip

parent 130c75bb
......@@ -266,6 +266,7 @@ def analyse(problem, niter=1000, show_progress=False):
xbounds = num.array(wproblem.get_parameter_bounds(), dtype=num.float)
npar = xbounds.shape[0]
print wproblem.ntargets, problem.ntargets
mss = num.zeros((niter, wproblem.ntargets))
rstate = num.random.RandomState(123)
......@@ -291,7 +292,6 @@ def analyse(problem, niter=1000, show_progress=False):
isok_mask = num.logical_not(isbad_mask)
else:
isok_mask = None
_, ms = wproblem.evaluate(x, mask=isok_mask)
mss[iiter, :] = ms
......
......@@ -112,6 +112,14 @@ class Problem(Object):
def ntargets(self):
return len(self.targets)
@property
def ntargets_waveform(self):
return len(self.waveform_targets)
@property
def ntargets_static(self):
return len(self.satellite_targets)
@property
def ndependants(self):
return len(self.dependants)
......
......@@ -723,9 +723,12 @@ class TargetConfig(Object):
targets.append(target)
if self.kite_scenes is not None:
logger.info('Selectiing satellite targets...')
get_satellite_targets()
else:
logger.info('Selectiing dynamic targets...')
get_dynamic_targets()
print targets
if self.limit:
return weed(origin, targets, self.limit)[0]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment