Select Git revision
trilinos
-
-
- Open in your IDE
- Download source code
Denis Ridzal
authored
and we had to resort to copying the files over to this release branch. ** Here is the summary of all changes in the master branch: >>> START commit d05cc6d9 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Oct 14 17:45:08 2015 -0600 Made CMakeLists.txt more automated. commit 4ec433a6 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Oct 14 16:03:47 2015 -0600 ROL_ConstraintStatusTest.hpp was not being installed. commit edad10db Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Oct 14 16:01:34 2015 -0600 ROL_StatusTestFactory.hpp was not being included. commit 8f7d2835 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Tue Oct 13 16:36:54 2015 -0600 Removed util directory and gross-pitaevskii, sacado examples which depend on it. Cleaned up casting in dual-spaces equality constrained ex commit 28966c0b Author: Denis Ridzal <dridzal@sandia.gov> Date: Tue Oct 13 15:30:56 2015 -0600 Adding partial release notes for Trilinos 12.4. commit 0f1cb0e7 Author: Denis Ridzal <dridzal@sandia.gov> Date: Tue Oct 13 14:43:56 2015 -0600 ** Removed the special instance of the bound constraint class for the diode circuit example; we use ROL::BoundConstraint now. ** For now, I had to try-catch vector casts in applyBinary methods in the ScaledStdVector classes. Once Drew is done dual-ifying the algorithms that deal with bounds, I'll revert this change. commit c4cd46e6 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Tue Oct 13 12:46:35 2015 -0600 Cleanup of casting, index type, and bound constraints in the parabolic control examples commit 6ac13d91 Merge: 8cd2f43 242e6a9 Author: Drew Kouri <dpkouri@sandia.gov> Date: Tue Oct 13 09:46:21 2015 -0600 Merge branch 'master' of software.sandia.gov:/space/git/Trilinos commit b2c773b1 Author: Drew Kouri <dpkouri@sandia.gov> Date: Tue Oct 13 09:45:57 2015 -0600 Added Doxygen documentation to MoreauYosidaPenaltyStep. commit 7c3aad37 Author: Denis Ridzal <dridzal@sandia.gov> Date: Tue Oct 13 09:31:07 2015 -0600 Changed example xml file to reflect changes to Augmented Lagrangian. commit bea771d6 Author: Drew Kouri <dpkouri@sandia.gov> Date: Tue Oct 13 09:06:39 2015 -0600 Changed all xml inputs to reflect changes to Augmented Lagrangian. commit 736f294e Author: Denis Ridzal <dridzal@sandia.gov> Date: Mon Oct 12 18:47:41 2015 -0600 Updating the use of Subproblem Step Type in Augmented Lagrangian. commit 4d03486f Author: Denis Ridzal <dridzal@sandia.gov> Date: Mon Oct 12 18:16:30 2015 -0600 ** Reverting the Burgers example_04 header to the version HEAD~4, i.e., from four commits ago. The objective value is different, and needs to be fixed before the file can be re-reverted: WORKING: Moreau-Yosida Penalty solver iter fval cnorm gnorm snorm penalty #fval #grad #cval subIter 0 1.173767e-02 1.818742e-16 3.514104e-02 1.000000e+02 1 1.134888e-03 2.853012e-16 9.801561e-15 2.904064e+00 1.000000e+02 16 16 3 6 NON-WORKING: Moreau-Yosida Penalty solver iter fval cnorm gnorm snorm penalty #fval #grad #cval subIter 0 1.331569e+01 3.484485e+01 5.733381e+03 1.000000e+02 1 1.134888e-03 5.312851e-16 1.211473e-13 9.275986e+02 1.000000e+02 310 310 3 153 The Augmented Lagrangian iteration history is a little different as well; there should be no differences whatsoever. commit 93066a36 Author: Drew Kouri <dpkouri@sandia.gov> Date: Mon Oct 12 18:02:30 2015 -0600 Deactivated bound constraints in Burger's example 04 for the time being. commit 700c21aa Merge: 64b6195 be85029 Author: Drew Kouri <dpkouri@sandia.gov> Date: Mon Oct 12 17:59:28 2015 -0600 Merge branch 'master' of software.sandia.gov:/space/git/Trilinos commit 6c23658c Author: Drew Kouri <dpkouri@sandia.gov> Date: Mon Oct 12 17:58:59 2015 -0600 Removed typedef of std::vector<Real> so that code is more easy to understand. commit b41de9fb Merge: 6496a18 067f7ea Author: Greg von Winckel <gvonwin@sandia.gov> Date: Mon Oct 12 17:56:37 2015 -0600 Merge branch 'master' of software.sandia.gov:/git/Trilinos commit 6bf66058 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Mon Oct 12 17:56:26 2015 -0600 Cleanup of casting and std::vector index type commit 14d4e520 Merge: c6d7aec 40b8209 Author: Drew Kouri <dpkouri@sandia.gov> Date: Mon Oct 12 17:40:56 2015 -0600 Merge branch 'master' of software.sandia.gov:/space/git/Trilinos commit c8580821 Author: Drew Kouri <dpkouri@sandia.gov> Date: Mon Oct 12 17:40:08 2015 -0600 Working on Augmented Lagrangian and Moreau-Yosida Penalty. Moreau-Yosida now works for equality constrained optimization. commit 9c3dfea0 Author: Denis Ridzal <dridzal@sandia.gov> Date: Mon Oct 12 17:24:48 2015 -0600 *** Changed the Composite Step constructor to process several parameter list options, including: -- setting the tolerance for the optimality system solver; -- choosing a fixed optimality solver tolerance; and -- taking parameters for the tangential subproblem solver from a Composite Step sublist. commit 9d80ec67 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Mon Oct 12 15:15:59 2015 -0600 removal of superfluous getConst calls. Cleanup of casting. Removal of unneeded specialized bound constraints. Conversion of std::vector in commit 5ffa00ff Author: Greg von Winckel <gvonwin@sandia.gov> Date: Mon Oct 12 08:32:21 2015 -0600 Fixed signed/unsigned comparison commit c3859d58 Author: Denis Ridzal <dridzal@sandia.gov> Date: Sat Oct 10 18:02:51 2015 -0600 ** Added a variant of ROL::StdVector that supports constant (positive) diagonal scalings in the dot product. This variant comprises the pair of classes ROL::PrimalScaledStdVector and ROL::DualScaledStdVector. ** Changed the diode-circuit example to use variable scalings through these new classes. commit cd90ee7c Author: Denis Ridzal <dridzal@sandia.gov> Date: Fri Oct 9 18:34:42 2015 -0600 ** Renamed Composite Step SQP to Composite Step throughout. ** Fixed problems with ROL_Sacado_EqualityConstraint_SimOpt.hpp; there were syntax errors in type conversions ?! ** Introduced a temporary fix for the Augmented Lagrangian to terminate at a reasonable iterate. commit 8b53145b Author: Drew Kouri <dpkouri@sandia.gov> Date: Fri Oct 9 17:27:35 2015 -0600 Fixed a bunch of errors in Sacado and Intrepid examples. commit 1470760f Author: Drew Kouri <dpkouri@sandia.gov> Date: Fri Oct 9 16:55:31 2015 -0600 Renamed DefaultAlgorithm to Algorithm. commit 18a665c5 Merge: 35af51e 2510072 Author: Drew Kouri <dpkouri@sandia.gov> Date: Fri Oct 9 16:48:46 2015 -0600 Merge branch 'master' of software.sandia.gov:/space/git/Trilinos Conflicts: packages/rol/example/burgers-control/example_04.cpp packages/rol/example/parabolic-control/example_04.cpp packages/rol/example/parabolic-control/input.xml packages/rol/example/topology-optimization/example_01.cpp packages/rol/src/step/ROL_AugmentedLagrangianStep.hpp commit 10734c14 Author: Drew Kouri <dpkouri@sandia.gov> Date: Fri Oct 9 16:43:34 2015 -0600 Working on Augmented Lagrangian and Moreau-Yosida. commit ce841c12 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Fri Oct 9 16:03:48 2015 -0600 More cleanup of downcasting, use of std::vector<T>::size_type instead of unsigned commit e031c652 Merge: bda03c4 77894af Author: Greg von Winckel <gvonwin@sandia.gov> Date: Fri Oct 9 16:02:35 2015 -0600 Merge branch 'master' of software.sandia.gov:/git/Trilinos commit 91316bed Author: Denis Ridzal <dridzal@sandia.gov> Date: Fri Oct 9 15:02:07 2015 -0600 Removing the algorithm factory. The constructors provided in ROL::Algorithm are sufficient. commit 1d17d2f9 Author: Denis Ridzal <dridzal@sandia.gov> Date: Fri Oct 9 14:25:30 2015 -0600 Changed the default for Nonlinear CG to Oren-Luenberger. Fixed the spelling of Hager-Zhang. commit 76b14e06 Merge: 281058d 652e5c0 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Fri Oct 9 13:17:26 2015 -0600 fixed conflict in parabolic-control/example_01.cpp commit 5ec7ad80 Merge: e4e05e2 182abe7 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Fri Oct 9 13:10:36 2015 -0600 More cleanup of casting, using std::vector<T>::size_type instead of unsigned, and removal of this-> commit e7628ed8 Author: Denis Ridzal <dridzal@sandia.gov> Date: Fri Oct 9 12:07:25 2015 -0600 Changed Teuchos::updateParametersFromXmlFile( paramfile, Teuchos::Ptr<Teuchos::ParameterList>(&*parlist) ); to Teuchos::updateParametersFromXmlFile( paramfile, parlist.ptr() ); throughout. In cases where parlist is not a Teuchos::RCP, we (still) use Teuchos::Ptr<Teuchos::ParameterList>(&parlist) commit d049f747 Author: Greg von Winckel <gvonwin@sandia.gov> Date: Fri Oct 9 08:36:53 2015 -0600 Cleanup of some type casting. Removal of some dependence on StdBoundConstraint. Deletion of unnecessary ''this'' pointers in classes. Conv commit 1ef6a58a Author: Denis Ridzal <dridzal@sandia.gov> Date: Thu Oct 8 17:47:52 2015 -0600 ** Changed DefaultAlgorithm to Algorithm throughout ROL, and introduced new constructors in tests and examples. ** Replaced flat parameter lists with hierarchical ones. ** Fine-tuned several test and examples. ** Re-enabled several examples; they are always built, and executed in RELEASE mode only. commit 6702f062 Author: Denis Ridzal <dridzal@sandia.gov> Date: Wed Oct 7 11:40:35 2015 -0600 Partial commit to convert all examples and test to use the new ROL::Algorithm class. commit 42c9c8a7 Merge: 9346ff3 1ef7480 Author: Drew Kouri <dpkouri@sandia.gov> Date: Tue Oct 6 13:49:10 2015 -0600 Merge branch 'master' of software.sandia.gov:/space/git/Trilinos commit 16948e13 Author: Drew Kouri <dpkouri@sandia.gov> Date: Tue Oct 6 13:47:30 2015 -0600 Changed factory functions to classes. Updated examples to reflect these changes. Added a constructor to Algorithm that will build steps and status tests using the factories. Combined some Burgers examples. Cleaned up the Moreau-Yosida step. commit dfdd883a Author: Greg von Winckel <gvonwin@sandia.gov> Date: Tue Oct 6 13:07:05 2015 -0600 changed mapping from ''Line Search Methods'' to ''Line-Search Methods'' commit 101bcd8b Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:53:21 2015 -0600 Moved example_07 to example_04. commit 9f9be3c8 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:52:24 2015 -0600 Moved constraints and objective definition into header. commit de91f8a2 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:51:47 2015 -0600 Moved example_04 back to example_05. commit 3e1f8738 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:47:22 2015 -0600 Moved objective, equality constraint, and bound constraint definition to header commit 503b1a13 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:45:43 2015 -0600 Moved example_05 to example_04 and added a header for objective and equality constraint definition. commit 510dfb78 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:44:44 2015 -0600 Added comparison test. commit 263aeffb Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:31:50 2015 -0600 renamed example_04 as example_03 commit 3a855e9c Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:31:09 2015 -0600 Not example_04 uses AlgorithmFactory. commit 487ac5a1 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:23:45 2015 -0600 moved example_03 into example_02. commit ee2fa28b Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:20:58 2015 -0600 Removed example_02. commit 0d1b3909 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:20:25 2015 -0600 Moved equality constraint and objective definition into header file. commit b35bfca0 Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:19:41 2015 -0600 Moved equality constraint and objective definition into header file. commit 76aff0dd Author: Drew Kouri <dpkouri@sandia.gov> Date: Wed Sep 30 14:18:56 2015 -0600 Added comparison of SQP and trust-region in example_03. <<< END
Name | Last commit | Last update |
---|