Changeset cfc53b

Timestamp:

Dec 4, 2010, 11:54:32 PM (14 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:

9eb7580

Parents:

a01144

git-author:

Frederik Heber <heber@…> (11/15/10 10:24:24)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:54:32)

Message:

Added template function toString(), is included in Assert.hpp.

• std::string() only works on char* not e.g. int. There we have to use stringstream. This function encapsulates this conversion.

Location:

src

Files:

• Helpers/Assert.hpp (modified) (2 diffs)
• Helpers/toString.hpp (added)
• UIElements/CommandLineUI/CommandLineParser.cpp (modified) (1 diff)

src/Helpers/Assert.hpp

@@ -14 +14 @@
 #include<vector>
 #include<map>
+
+#include "Helpers/toString.hpp"
 
 /**
@@ -184 +186 @@
  * This can be done in the following way:
  * @code
- * ASSERT(!i,"i was not zero but "+std::string(i)+"after incrementing");
- * @endcode
- * Note that this works because std::string() in the middle requires the const char arrays on both ends
- * to be converted to string and eventually, the whole text is again cast to const char * form.
+ * ASSERT(!i,"i was not zero but "+toString(i)+"after incrementing");
+ * @endcode
+ * Note that this works because of the template function toString() (in src/Helpers/toString.hpp) that
+ * uses stringstreams to convert any value to std::string if the respective operator<< is implemented.
  * <li> <H4> ASSERT() is broken. When I abort the program it says something about an
  * "Illegal instruction"</H4>

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -412 +412 @@
     if ((iter->second)->Traits.hasShortForm()) {
       ASSERT(result.find((iter->second)->Traits.getShortForm()) == result.end(),
-          "Short form "+std::string((iter->second)->Traits.getShortForm())+
-          " for action "+std::string(iter->first)+" already present from "+
+          "Short form "+toString((iter->second)->Traits.getShortForm())+
+          " for action "+toString(iter->first)+" already present from "+
           std::string(result[(iter->second)->Traits.getShortForm()])+"!");
       result[(iter->second)->Traits.getShortForm()] = (iter->second)->getName();