From 191d0e242c86b9c33705e76a2ee42ade121d32f3 Mon Sep 17 00:00:00 2001
From: rowanc1 <rowan@visiblegeology.com>
Date: Wed, 4 Dec 2013 16:10:31 -0800
Subject: [PATCH] Create a new inversion node every time inversion is ran.

---
 SimPEG/inverse/Optimize.py | 10 +++++++++-
 SimPEG/utils/Save.py       | 18 ++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/SimPEG/inverse/Optimize.py b/SimPEG/inverse/Optimize.py
index 80a03632..41fd3c22 100644
--- a/SimPEG/inverse/Optimize.py
+++ b/SimPEG/inverse/Optimize.py
@@ -266,9 +266,17 @@ class Minimize(object):
         printStoppers(self, stoppers, pad='', stop=stop, done=done)
 
 
+    @callHooks('finish')
     def finish(self):
-        pass
+        """finish()
 
+            **finish** is called at the end of the optimization.
+
+            :rtype: None
+            :return: None
+
+        """
+        pass
 
     def stoppingCriteria(self, inLS=False):
         if self._iter == 0:
diff --git a/SimPEG/utils/Save.py b/SimPEG/utils/Save.py
index 4c646971..e7bec76d 100644
--- a/SimPEG/utils/Save.py
+++ b/SimPEG/utils/Save.py
@@ -29,10 +29,14 @@ class SimPEGTable:
 
         self.inversions = hdf5InversionGroup(self,self.root.addGroup('inversions',soft=True))
 
+    def show(self): self.root.show()
 
     def saveInversion(self, invObj, dataPath):
 
-        invObj._invNode = self.inversions.addGroup('%d'%self.inversions.numChildren)
+        # Create a new inversion anytime this is run.
+        def _startup_hdf5_inv(invObj, m0):
+            invObj._invNode = self.inversions.addGroup('%d'%self.inversions.numChildren)
+        invObj.hook(_startup_hdf5_inv, overwrite=True)
 
         # At the start of every iteration we will create a inversion iteration node.
         def _doStartIteration_hdf5_inv(invObj):
@@ -53,6 +57,14 @@ class SimPEGTable:
             invNodeIt.attrs['complete'] = True
         invObj.hook(_doEndIteration_hdf5_inv, overwrite=True)
 
+        # Delete all iterates that did not finish.
+        def _finish_hdf5_inv(invObj):
+            for it in invObj._invNode:
+                if not it.attrs['complete']:
+                    del self.f[it.path]
+            del invObj._invNode
+        invObj.hook(_finish_hdf5_inv, overwrite=True)
+
         def _doStartIteration_hdf5_opt(optObj):
             optNodeIt = optObj.parent._invNode.addGroup('%d.%d'%(optObj.parent._iter, optObj._iter))
             optNodeIt.attrs['complete'] = False
@@ -71,7 +83,6 @@ class SimPEGTable:
             optNodeIt.attrs['complete'] = True
         invObj.opt.hook(_doEndIteration_hdf5_opt, overwrite=True)
 
-        return invObj._invNode
 
 
 
@@ -143,6 +154,9 @@ class hdf5Group(object):
             child = self.childClass(self.T, child)
         return child
 
+    def __contains__(self, key):
+        return key in self.children
+
     def show(self, pad='', maxDepth=1, depth=0):
         """
             Recursively show the structure of the database.