From b5eb72e097a1fa83828e3e67238bbf4d324fd077 Mon Sep 17 00:00:00 2001
From: rowanc1 <rowan@visiblegeology.com>
Date: Fri, 6 Dec 2013 14:27:59 -0800
Subject: [PATCH] Moved DC and Linear to the examples directory.

---
 .../{forward/DCProblem.py => examples/DC.py}   |  0
 .../LinearProblem.py => examples/Linear.py}    | 18 +++++++-----------
 SimPEG/examples/__init__.py                    |  2 ++
 SimPEG/forward/__init__.py                     |  2 --
 SimPEG/tests/test_forward_DCproblem.py         |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)
 rename SimPEG/{forward/DCProblem.py => examples/DC.py} (100%)
 rename SimPEG/{forward/LinearProblem.py => examples/Linear.py} (76%)

diff --git a/SimPEG/forward/DCProblem.py b/SimPEG/examples/DC.py
similarity index 100%
rename from SimPEG/forward/DCProblem.py
rename to SimPEG/examples/DC.py
diff --git a/SimPEG/forward/LinearProblem.py b/SimPEG/examples/Linear.py
similarity index 76%
rename from SimPEG/forward/LinearProblem.py
rename to SimPEG/examples/Linear.py
index 5a996c71..b593edf8 100644
--- a/SimPEG/forward/LinearProblem.py
+++ b/SimPEG/examples/Linear.py
@@ -1,16 +1,12 @@
-import numpy as np
-from SimPEG.mesh import TensorMesh
-from SimPEG.forward import Problem
-from SimPEG.regularization import Regularization
-from SimPEG.inverse import *
+from SimPEG import mesh, forward, inverse, regularization, np
 import matplotlib.pyplot as plt
 
 
-class LinearProblem(Problem):
+class LinearProblem(forward.Problem):
     """docstring for LinearProblem"""
 
     def __init__(self, *args, **kwargs):
-        Problem.__init__(self, *args, **kwargs)
+        forward.Problem.__init__(self, *args, **kwargs)
 
     def dpred(self, m, u=None):
         return self.G.dot(m)
@@ -24,7 +20,7 @@ class LinearProblem(Problem):
 
 def example(N):
     h = np.ones(N)/N
-    M = TensorMesh([h])
+    M = mesh.TensorMesh([h])
 
     nk = 20
     jk = np.linspace(1.,20.,nk)
@@ -63,9 +59,9 @@ if __name__ == '__main__':
     prob, m_true = example(100)
     M = prob.mesh
 
-    reg = Regularization(M)
-    opt = InexactGaussNewton(maxIter=20)
-    inv = Inversion(prob,reg,opt,beta0=1e-4)
+    reg = regularization.Regularization(M)
+    opt = inverse.InexactGaussNewton(maxIter=20)
+    inv = inverse.Inversion(prob,reg,opt,beta0=1e-4)
     m0 = np.zeros_like(m_true)
 
     mrec = inv.run(m0)
diff --git a/SimPEG/examples/__init__.py b/SimPEG/examples/__init__.py
index e69de29b..a5c37345 100644
--- a/SimPEG/examples/__init__.py
+++ b/SimPEG/examples/__init__.py
@@ -0,0 +1,2 @@
+import DC
+import Linear
diff --git a/SimPEG/forward/__init__.py b/SimPEG/forward/__init__.py
index 33c9a6b1..ce6f7e52 100644
--- a/SimPEG/forward/__init__.py
+++ b/SimPEG/forward/__init__.py
@@ -1,4 +1,2 @@
 from Problem import *
-import DCProblem
-from LinearProblem import LinearProblem
 import ModelTransforms
diff --git a/SimPEG/tests/test_forward_DCproblem.py b/SimPEG/tests/test_forward_DCproblem.py
index 847d1055..c81c885a 100644
--- a/SimPEG/tests/test_forward_DCproblem.py
+++ b/SimPEG/tests/test_forward_DCproblem.py
@@ -3,7 +3,7 @@ import unittest
 from SimPEG.mesh import TensorMesh
 from SimPEG.utils import ModelBuilder, sdiag
 from SimPEG.forward import Problem
-from SimPEG.forward.DCProblem import *
+from SimPEG.examples.DC import *
 from TestUtils import checkDerivative
 from scipy.sparse.linalg import dsolve
 from SimPEG.regularization import Regularization