Commit Graph

48 Commits

Author SHA1 Message Date
Rowan Cockett 82f5a5660f Documentation on how I am picking the initial beta. 2013-11-22 14:06:22 -08:00
Rowan Cockett aae725ff05 TimeSteppingInversion and Estimate Initial Beta based on eigenvalues comparison. 2013-11-22 13:39:26 -08:00
Rowan Cockett c41b9f12e9 Documentation updates to optimize. Updated the hook method. 2013-11-22 11:58:31 -08:00
Rowan Cockett 6216ae977e Added hook method to utils so that we can hook new methods dynamically into the classes. 2013-11-22 10:51:01 -08:00
Rowan Cockett dbaea1fda9 callHooks generalizes some of the hook calling code in Optimize and Inversion 2013-11-21 16:56:01 -08:00
Rowan Cockett 0bd971c22f Removed PubSub based communication. 2013-11-21 15:12:28 -08:00
Rowan Cockett 82edbf7a60 Merge branch 'master' of https://bitbucket.org/rcockett/simpeg into richards
Conflicts:
	SimPEG/inverse/Optimize.py
	SimPEG/regularization/Regularization.py
2013-11-21 11:56:12 -08:00
Rowan Cockett 2782a6fcfb Simple profiling through decorator functions. (counting and timing of functions decorated with @count and @timeIt that have a SimPEG.utils.Counter)
e.g. output:
‘’’
Counters:
  InexactGaussNewton.doEndIteration       :        6
  InexactGaussNewton.printIter            :        7
  InexactGaussNewton.scaleSearchDirection :        6

Times:                                        mean      sum
  InexactGaussNewton.findSearchDirection  : 1.55e-02, 9.29e-02,    6x
  InexactGaussNewton.minimize             : 1.10e-01, 1.10e-01,    1x
  InexactGaussNewton.modifySearchDirection: 2.89e-04, 1.73e-03,    6x
  InexactGaussNewton.projection           : 3.69e-06, 1.11e-04,   30x
  InexactGaussNewton.stoppingCriteria     : 1.16e-04, 1.51e-03,   13x
  Inversion.dataObj                       : 6.60e-05, 8.58e-04,   13x
  Inversion.dataObj2Deriv                 : 1.03e-04, 6.20e-03,   60x
  Inversion.dataObjDeriv                  : 5.06e-05, 3.54e-04,    7x
  Inversion.evalFunction                  : 7.75e-04, 1.01e-02,   13x
  Inversion.run                           : 1.10e-01, 1.10e-01,    1x
  Regularization.modelObj                 : 3.56e-04, 4.63e-03,   13x
  Regularization.modelObj2Deriv           : 1.29e-03, 7.76e-02,   60x
  Regularization.modelObjDeriv            : 5.01e-04, 3.51e-03,    7x
‘’’
2013-11-20 21:59:53 -08:00
Rowan Cockett 808036ddc8 Bug fixes in optimization. 2013-11-20 19:37:48 -08:00
Rowan Cockett 1c895f397d Set Mref in inversion. 2013-11-20 19:37:09 -08:00
Rowan Cockett 0afe42aa34 Bug fix in timeStep (must return something, not an error.) Minor updates to Optimize and Inversion. 2013-11-19 17:49:18 -08:00
Rowan Cockett b246b629a5 Merge branch 'BFGS' of https://bitbucket.org/rcockett/simpeg into richards 2013-11-19 17:46:48 -08:00
Rowan Cockett 500844ccb5 Brought BFGS into Optimize. updated InexactGaussNewton to use BFGS as a preconditioner. 2013-11-19 17:41:51 -08:00
Rowan Cockett fc435feb9e BFGS implementation in the notebook. 2013-11-19 15:59:37 -08:00
Rowan Cockett 278eec94ec Ensure that (1/dt) gives a float not an int. Use (1.0/dt). Added fullJ calculation. Tested Sensitivity. 2013-11-15 13:59:41 -08:00
Rowan Cockett 61e175cd12 Fields calculation in Richards. Calculation of the diagonals of the Jacobian. 2013-11-14 15:29:25 -08:00
Rowan Cockett 81dea1a5dd Added NewtonRoot finding algorithm. 2013-11-14 11:26:55 -08:00
Rowan Cockett 15e0126172 Updates to Optimization Framework. Testing. Bug Fixes. 2013-11-12 11:09:51 -08:00
Rowan Cockett 19f79b3275 updates to Inversion. Bug Fixes. 2013-11-07 17:42:24 -08:00
Rowan Cockett bc71b184aa Brought inversion into line with optimize changes. 2013-11-07 16:27:12 -08:00
Rowan Cockett 0dc3b02c45 Combined stopping criteria and printers into a class, for easy reuse. 2013-11-07 16:02:22 -08:00
Rowan Cockett 54d2f302b5 Refactored and moved duplicate code to utils. 2013-11-07 15:28:03 -08:00
Rowan Cockett 1ef70ba15c Moved projectedGradient to the optimize file. Added video to IPNB. 2013-11-07 14:56:54 -08:00
Rowan Cockett ded738b077 Changes to evalFunction. and more extensible calls in startup and endIteration 2013-11-07 12:27:07 -08:00
Rowan Cockett 318ca555c8 Stopping Criteria and Printers generalized in Optimize. 2013-11-07 01:20:03 -08:00
Rowan Cockett f60017ff50 Updates on printing and stopping criteria. These can be set and modified much easier without rewriting functions. 2013-11-06 21:03:07 -08:00
Rowan Cockett 22f1ff9f74 initial notebook laying out the problem of bound constraints. 2013-11-06 10:57:13 -08:00
Rowan Cockett 6f141ecaf2 Updates to DCProblem and testing. 2013-11-04 15:11:10 -08:00
Rowan Cockett df51919d81 Documentation Updates. Issue #11 2013-11-04 11:49:55 -08:00
Rowan Cockett ac099f08cd There are some compatibility issues with pypubsub installing on the documentation servers. and confusion when installing this on other peoples comps. I have put a warning in. Code should work regardless of if you have pypubsub installed or not. 2013-11-04 10:26:56 -08:00
Rowan Cockett 56bacc4a27 Issue #15 Approximate Hessians. By default these are not implemented, and are the same as J and Jt 2013-11-04 09:53:38 -08:00
Rowan Cockett 224b0cea9e Issue #17 Scaled gradient. moved this to an overridable function. Changed linesearch to modifySearchDirection 2013-11-04 09:43:49 -08:00
Dave Marchant a1a6e67925 Added max step size option to Optimize code. 2013-11-03 10:36:22 -08:00
Rowan Cockett 510ca4a54e Issue #11 PubSub based communications in Minimize. 2013-11-01 15:04:16 -07:00
Rowan Cockett 581f1b15f1 renamed misfit to dataResidual in Problem class. fixed betaSchedule bug. Printing in the inversion. 2013-11-01 15:02:37 -07:00
Rowan Cockett 86c1080631 Documentation updates. 2013-10-26 16:19:02 -07:00
Rowan Cockett dbd24b71c1 Added kwargs to the inversion. can use these to initiate your inversion object. 2013-10-26 14:16:50 -07:00
Rowan Cockett 3bbe258eab beta schedualing 2013-10-25 11:14:21 -07:00
Rowan Cockett fc4294eb4d Added A sample Linear problem that runs! 2013-10-24 15:11:48 -07:00
Rowan Cockett f4c63d47a3 took for loop out of inversion framework. This has to be dealt with in the specific code, and is more flexible. 2013-10-24 14:12:37 -07:00
Rowan Cockett d94d3f7f37 fixes to inversion framework. DC problem is kinda working…?! 2013-10-23 18:35:37 -07:00
Rowan Cockett 548ba9aa0a bug fixes to framework. 2013-10-23 18:19:33 -07:00
Rowan Cockett 2bb20280bf to get working.. 2013-10-22 20:11:30 -07:00
Rowan Cockett 2a8f43aa10 Inversion Framework - a start.. 2013-10-22 19:42:38 -07:00
Rowan Cockett 0cb9fa210a print statements now go to problem if they are implemented there. 2013-10-22 14:43:24 -07:00
Rowan Cockett 0089931075 bug fixes for optimization 2013-10-07 15:15:18 -07:00
Rowan Cockett 7cf8ef2310 Moved testing code to the test directory. added __init__.py and some documentation. 2013-10-03 14:55:22 -07:00
Rowan Cockett a6da74c347 Creating the inverse problem framework. Feedback welcome! 2013-10-01 20:33:57 -07:00