Merge branch 'master' of https://github.com/simpeg/simpeg into cylClean

This commit is contained in:
rowanc1
2014-03-17 11:30:52 -07:00
2 changed files with 10 additions and 3 deletions
+7
View File
@@ -47,6 +47,13 @@ class BaseSurvey(object):
self.prob._survey = None
self._prob = None
@property
def nD(self):
"""Number of data."""
if hasattr(self, 'dobs'):
return self.dobs.size
raise NotImplemented('Number of data is unknown.')
@property
def ispaired(self): return self.prob is not None
+3 -3
View File
@@ -10,10 +10,10 @@ Model
:undoc-members:
:inherited-members:
Data
====
Survey
======
.. automodule:: SimPEG.Data
.. automodule:: SimPEG.Survey
:show-inheritance:
:members:
:undoc-members: