Moved DC and Linear to the examples directory.

This commit is contained in:
rowanc1
2013-12-06 14:27:59 -08:00
parent 9e26543931
commit b5eb72e097
5 changed files with 10 additions and 14 deletions
@@ -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)
+2
View File
@@ -0,0 +1,2 @@
import DC
import Linear
-2
View File
@@ -1,4 +1,2 @@
from Problem import *
import DCProblem
from LinearProblem import LinearProblem
import ModelTransforms
+1 -1
View File
@@ -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