Updating version number and fixing some stuff.

AdvancedPhotonSource · Oct 29, 2016 · 5593a8a · 5593a8a
1 parent 36c1680
commit 5593a8a
Show file tree

Hide file tree

Showing 8 changed files with 108 additions and 77 deletions.
diff --git a/docs/demos/FullReferenceMetrics.ipynb b/docs/demos/FullReferenceMetrics.ipynb
diff --git a/docs/demos/NoReferenceMetrics.ipynb b/docs/demos/NoReferenceMetrics.ipynb
diff --git a/docs/demos/Shepp.ipynb b/docs/demos/Shepp.ipynb
diff --git a/docs/demos/StandardPatterns.ipynb b/docs/demos/StandardPatterns.ipynb
diff --git a/docs/demos/WetCircles.ipynb b/docs/demos/WetCircles.ipynb
diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@
 import setuptools
 from version_hashtag import append_dev_info
 
-version_info = (0, 1, 0)
+version_info = (0, 2, 0)
 version = '.'.join([str(x) for x in version_info])
 version = append_dev_info(version)
 with open('VERSION', 'w') as f:

diff --git a/xdesign/acquisition.py b/xdesign/acquisition.py
@@ -141,7 +141,7 @@ def measure(self, phantom, noise=False):
  return newdata
 
  def record(self):
- self.history.append(self.numpy)
+ self.history.append(self.list)
 
 
 def sinogram(sx, sy, phantom, noise=False):

diff --git a/xdesign/geometry.py b/xdesign/geometry.py
@@ -355,6 +355,11 @@ def numpy(self):
  """Return list representation."""
  return np.vstack((self.p1._x, self.p2._x))
 
+ @property
+ def list(self):
+ """Return list representation."""
+ return np.hstack((self.p1._x, self.p2._x))
+
  @property
  def dim(self):
  """The dimensionality of the entity"""