--- trunk/OOPSE-2.0/src/minimizers/MinimizerParameterSet.cpp	2005/01/12 22:41:40	1930
+++ trunk/OOPSE-2.0/src/minimizers/MinimizerParameterSet.cpp	2005/10/13 22:26:47	2364
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -43,46 +43,46 @@ namespace oopse {
 
 namespace oopse {
 
-MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) {
+  MinimizerParameterSet::MinimizerParameterSet(SimInfo* info) : defaultTolerance(1.0e-8) {
     setDefaultParameter();
 
     Globals* globals = info->getSimParams();
 
     if (globals->haveMinimizer()){
-        setFTol(globals->getMinFTol());
+      setFTol(globals->getMinimizerFTol());
     }
 
-    if (globals->haveMinGTol()){
-        setGTol(globals->getMinGTol());
+    if (globals->haveMinimizerGTol()){
+      setGTol(globals->getMinimizerGTol());
     }
 
-    if (globals->haveMinMaxIter()){
-        setMaxIteration(globals->getMinMaxIter());
+    if (globals->haveMinimizerMaxIter()){
+      setMaxIteration(globals->getMinimizerMaxIter());
     }
 
-    if (globals->haveMinWriteFrq()){
-        setMaxIteration(globals->getMinMaxIter());
+    if (globals->haveMinimizerWriteFrq()){
+      setMaxIteration(globals->getMinimizerMaxIter());
     }
 
-    if (globals->haveMinWriteFrq()){
-        setWriteFrq(globals->getMinWriteFrq());
+    if (globals->haveMinimizerWriteFrq()){
+      setWriteFrq(globals->getMinimizerWriteFrq());
     }
     
-    if (globals->haveMinStepSize()){
-        setStepSize(globals->getMinStepSize());
+    if (globals->haveMinimizerStepSize()){
+      setStepSize(globals->getMinimizerStepSize());
     }
 
-    if (globals->haveMinLSMaxIter()){
-        setLineSearchMaxIteration(globals->getMinLSMaxIter());
+    if (globals->haveMinimizerLSMaxIter()){
+      setLineSearchMaxIteration(globals->getMinimizerLSMaxIter());
     }    
 
-    if (globals->haveMinLSTol()){
-        setLineSearchTol(globals->getMinLSTol());
+    if (globals->haveMinimizerLSTol()){
+      setLineSearchTol(globals->getMinimizerLSTol());
     }
 
-}
+  }
 
-void MinimizerParameterSet::setDefaultParameter() {
+  void MinimizerParameterSet::setDefaultParameter() {
     maxIteration = 200;
     stepSize = 0.01;
     stepTol = defaultTolerance;
@@ -91,7 +91,7 @@ void MinimizerParameterSet::setDefaultParameter() {
     writeFrq = maxIteration;
     lsMaxIteration = 50;
     lsTol = defaultTolerance;
-}
+  }