Changeset 9b56f34 for src

Timestamp:

Sep 19, 2013, 8:23:52 PM (11 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:

477012

Parents:

bad589

git-author:

Frederik Heber <heber@…> (08/23/13 16:53:06)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

ActionParameters need special format when given to CLI.

• introduced toCLIString which converts some parameters types to the required format, e.g. Vector as "x,y,z", ...

Location:

src/Actions

Files:

• ActionSequence.cpp (modified) (1 diff)
• Action_impl_pre.hpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• MakroAction_impl_pre.hpp (modified) (2 diffs)
• Reaction_impl_pre.hpp (modified) (2 diffs)
• toCLIString.cpp (added)
• toCLIString.hpp (added)

src/Actions/ActionSequence.cpp

@@ -163 +163 @@
   for(std::deque<Action*>::const_iterator it=actions.begin();it!=actions.end();++it){
     (*it)->outputAsCLI(ost);
-    ost << std::endl;
+    ost << " ";
   }
 }

src/Actions/Action_impl_pre.hpp

@@ -53 +53 @@
 
 #include "Actions/ActionQueue.hpp"
+#include "Actions/toCLIString.hpp"
 #include "Parameters/Parameter.hpp"
 
@@ -150 +151 @@
       << "--" << \
     BOOST_PP_SEQ_ELEM(n, paramtokens) \
-      << " \"" << params. \
-          BOOST_PP_SEQ_ELEM(n, paramreferences) \
-          .get() \
-      << "\"";
+    << " \"" << toCLIString(params. \
+        BOOST_PP_SEQ_ELEM(n, paramreferences) \
+        .get()) \
+    << "\"";
 
 // prints if statement to check two strings (paramtokens[n] vs. TOKEN)

src/Actions/Makefile.am

@@ -16 +16 @@
   Actions/OptionTrait.cpp \
   Actions/Process.cpp \
+  Actions/toCLIString.cpp \
   Actions/UndoRedoHelpers.cpp \
   Actions/Values.cpp
@@ -51 +52 @@
   Actions/Reaction_impl_header.hpp \
   Actions/Reaction_impl_pre.hpp \
+  Actions/toCLIString.hpp \
   Actions/UndoRedoHelpers.hpp \
   Actions/Values.hpp

src/Actions/MakroAction_impl_pre.hpp

@@ -51 +51 @@
 
 #include "Actions/ActionQueue.hpp"
+#include "Actions/toCLIString.hpp"
 #include "Parameters/Parameter.hpp"
 
@@ -148 +149 @@
       << "--" << \
     BOOST_PP_SEQ_ELEM(n, paramtokens) \
-      << " \"" << params. \
-          BOOST_PP_SEQ_ELEM(n, paramreferences) \
-          .get() \
-      << "\"";
+    << " \"" << toCLIString(params. \
+        BOOST_PP_SEQ_ELEM(n, paramreferences) \
+        .get()) \
+    << "\"";
 
 // prints if statement to check two strings (paramtokens[n] vs. TOKEN)

src/Actions/Reaction_impl_pre.hpp

@@ -43 +43 @@
 
 #include "Actions/ActionQueue.hpp"
+#include "Actions/toCLIString.hpp"
 
 // some derived names: if CATEGORY is not given, we don't prefix with it
@@ -132 +133 @@
       << "--" << \
     BOOST_PP_SEQ_ELEM(n, paramtokens) \
-      << " \"" << params. \
-          BOOST_PP_SEQ_ELEM(n, paramreferences) \
-          .get() \
-      << "\"";
+    << " \"" << toCLIString(params. \
+        BOOST_PP_SEQ_ELEM(n, paramreferences) \
+        .get()) \
+    << "\"";
 
 // prints if statement to check two strings (paramtokens[n] vs. TOKEN)