Cleaning up imports.

SimPEG/forward/Problem.py

@@ -1,5 +1,5 @@
 from SimPEG import utils, np, sp
-import Data
+import SimPEGData
 norm = np.linalg.norm
 
 
@@ -212,7 +212,7 @@ class Problem(object):
         noise = std*abs(dtrue)*np.random.randn(*dtrue.shape)
         dobs = dtrue+noise
         stdev = dobs*0 + std
-        return Data.SimPEGData(self, dobs=dobs, std=stdev, dtrue=dtrue, mtrue=m)
+        return SimPEGData.Data(dobs=dobs, std=stdev, dtrue=dtrue, mtrue=m)
 
 
 

SimPEG/forward/SimPEGData.py

@@ -32,7 +32,7 @@ def requiresProblem(f):
     return requiresProblemWrapper
 
 
-class SimPEGData(object):
+class Data(object):
     """Data holds the observed data, and the standard deviations."""
 
     __metaclass__ = utils.Save.Savable
@@ -72,14 +72,17 @@ class SimPEGData(object):
 
     @requiresProblem
     def dpred(self, m, u=None):
-        pass
+        if u is None: u = self.prob.field(m)
 
+    @requiresProblem
     def residual(self, m, u=None):
-        pass
+        if u is None: u = self.prob.field(m)
 
+    @requiresProblem
     def residualWeighted(self, m, u=None):
-        pass
+        if u is None: u = self.prob.field(m)
 
+    @requiresProblem
     def projectField(self, m, u=None):
         """
             Projection matrix.
@@ -87,6 +90,7 @@ class SimPEGData(object):
             .. math::
                 d_\\text{pred} = Pu(m)
         """
+        if u is None: u = self.prob.field(m)
         return self.P*u
 
 

SimPEG/forward/__init__.py

@@ -1,3 +1,3 @@
 from Problem import *
 import ModelTransforms
-from Data import *
+from SimPEGData import *