Commit Graph

5 Commits

Author SHA1 Message Date
Lindsey Heagy ae9ca6cec9 Merge branch 'feat/sparse-regularization' into patch/sparse-dcip
# Conflicts:
#	SimPEG/Examples/__init__.py
#	SimPEG/Optimization.py
2016-04-06 14:53:45 -07:00
D Fournier df620b42bd Fix plotting for Linear_IRLS example 2016-04-05 13:23:08 -07:00
D Fournier 2ee158e5d7 Add distance weighting to example
TO DO: Create example with and without distance weights
2016-04-03 17:26:04 -07:00
D Fournier 8f73b2e7be Update directives
Add IRLS example
2016-04-03 17:18:39 -07:00
D Fournier 16d62a6d0a Merge branch 'Examples' into feat/sparse-regularization
Conflicts:
	SimPEG/Examples/__init__.py
2016-04-03 11:11:35 -07:00