Changeset f10b0c for src/Actions/CommandAction

Timestamp:

Jun 11, 2012, 9:53:19 AM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

95f965

Parents:

b9c69d

git-author:

Michael Ankele <ankele@…> (04/24/12 13:55:16)

git-committer:

Frederik Heber <heber@…> (06/11/12 09:53:19)

Message:

disastrously big and ugly commit

• using new Parameter<T> classes:
  • Actions
  • Queries (all UIs)

• TODO:
  • actions crash cause Value is unset
  • no query<BoxVector>

Location:

src/Actions/CommandAction

Files:

• BondLengthTableAction.cpp (modified) (3 diffs)
• ElementDbAction.cpp (modified) (2 diffs)
• FastParsingAction.cpp (modified) (2 diffs)
• HelpAction.cpp (modified) (3 diffs)
• VerboseAction.cpp (modified) (3 diffs)

src/Actions/CommandAction/BondLengthTableAction.cpp

@@ -43 +43 @@
   ostringstream usage;
 
-  LOG(0, "Using " << params.BondGraphFileName << " as bond length table.");
+  LOG(0, "Using " << params.BondGraphFileName.get() << " as bond length table.");
   BondGraph *&BG = World::getInstance().getBondGraph();
 
@@ -57 +57 @@
 
   BG->CleanupBondLengthTable();
-  if ((!params.BondGraphFileName.empty())
-      && boost::filesystem::exists(params.BondGraphFileName)) {
-    std::ifstream input(params.BondGraphFileName.string().c_str());
+  if ((!params.BondGraphFileName.get().empty())
+      && boost::filesystem::exists(params.BondGraphFileName.get())) {
+    std::ifstream input(params.BondGraphFileName.get().string().c_str());
     if ((input.good()) && (BG->LoadBondLengthTable(input))) {
       LOG(0, "Bond length table parsed successfully.");
@@ -96 +96 @@
   BondGraph *&BG = World::getInstance().getBondGraph();
   BG->CleanupBondLengthTable();
-  std::ifstream input(state->params.BondGraphFileName.string().c_str());
+  std::ifstream input(state->params.BondGraphFileName.get().string().c_str());
   if ((input.good()) && (BG->LoadBondLengthTable(input))) {
     LOG(0, "Bond length table parsed successfully.");

src/Actions/CommandAction/ElementDbAction.cpp

@@ -60 +60 @@
   // TODO: Make databasepath a std::string
   config *configuration = World::getInstance().getConfig();
-  strcpy(configuration->databasepath, params.databasepath.branch_path().string().c_str());
+  strcpy(configuration->databasepath, params.databasepath.get().branch_path().string().c_str());
 
   // load table
@@ -96 +96 @@
   // TODO: Make databasepath a std::string
   config *configuration = World::getInstance().getConfig();
-  strcpy(configuration->databasepath, state->params.databasepath.branch_path().string().c_str());
+  strcpy(configuration->databasepath, state->params.databasepath.get().branch_path().string().c_str());
 
   // load table

src/Actions/CommandAction/FastParsingAction.cpp

@@ -40 +40 @@
   bool oldvalue = configuration->FastParsing;
 
-  configuration->FastParsing = params.fastparsing;
+  configuration->FastParsing = params.fastparsing.get();
   if (configuration->FastParsing)
     LOG(0, "I won't parse trajectories.");
@@ -65 +65 @@
 
   config *configuration = World::getInstance().getConfig();
-  configuration->FastParsing = state->params.fastparsing;
+  configuration->FastParsing = state->params.fastparsing.get();
   if (configuration->FastParsing)
     LOG(0, "I won't parse trajectories.");

src/Actions/CommandAction/HelpAction.cpp

@@ -63 +63 @@
   std::cout << std::endl;
   // print list of actions or its options
-  if (params.actionname == "none") {
+  if (params.actionname.get() == "none") {
     // print list of all Actions
     std::cout << "Here is a list of all available Actions:" << std::endl;
@@ -75 +75 @@
   } else {
     // retrieve command from Registry and print its help
-    if (ActionRegistry::getInstance().isActionPresentByName(params.actionname)) {
-      const Action *instance = ActionRegistry::getInstance().getActionByName(params.actionname);
+    if (ActionRegistry::getInstance().isActionPresentByName(params.actionname.get())) {
+      const Action *instance = ActionRegistry::getInstance().getActionByName(params.actionname.get());
       // else give description of Action and its option value if present
       std::cout << instance->help();
@@ -82 +82 @@
       std::cout << std::endl;
     } else {
-      ELOG(1, "No action is known by the name " << params.actionname << ".");
+      ELOG(1, "No action is known by the name " << params.actionname.get() << ".");
       return Action::failure;
     }

src/Actions/CommandAction/VerboseAction.cpp

@@ -37 +37 @@
   int oldverbosity = getVerbosity();
 
-  if (oldverbosity != params.verbosity) {
+  if (oldverbosity != params.verbosity.get()) {
     // prepare undo state
     CommandVerboseState *UndoState = new CommandVerboseState(oldverbosity, params);
     // set new verbosity
-    setVerbosity(params.verbosity);
-    LOG(0, "Setting verbosity from " << oldverbosity << " to " << params.verbosity << ".");
+    setVerbosity(params.verbosity.get());
+    LOG(0, "Setting verbosity from " << oldverbosity << " to " << params.verbosity.get() << ".");
     return Action::state_ptr(UndoState);
   } else {
@@ -53 +53 @@
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
-  LOG(0, "Setting verbosity from " << state->params.verbosity << " to " << state->oldverbosity << ".");
+  LOG(0, "Setting verbosity from " << state->params.verbosity.get() << " to " << state->oldverbosity << ".");
   setVerbosity(state->oldverbosity);
 
@@ -62 +62 @@
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
-  LOG(0, "Setting verbosity from " << state->oldverbosity << " to " << state->params.verbosity << ".");
-  setVerbosity(state->params.verbosity);
+  LOG(0, "Setting verbosity from " << state->oldverbosity << " to " << state->params.verbosity.get() << ".");
+  setVerbosity(state->params.verbosity.get());
 
   return Action::state_ptr(_state);