Changeset d41313

Timestamp:

Nov 7, 2011, 10:46:37 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:

05736a

Parents:

dad802

git-author:

Frederik Heber <heber@…> (09/26/11 11:16:53)

git-committer:

Frederik Heber <heber@…> (11/07/11 10:46:37)

Message:

Added output operators for both ActionTraits and OptionTrait.

Location:

src/Actions

Files:

• ActionTraits.cpp (modified) (1 diff)
• ActionTraits.hpp (modified) (2 diffs)
• OptionTrait.cpp (modified) (1 diff)
• OptionTrait.hpp (modified) (2 diffs)

src/Actions/ActionTraits.cpp

@@ -167 +167 @@
 }
 
+/** Output operator for ActionTrait.
+ *
+ * \param &out stream to output to
+ */
+std::ostream &operator<<(std::ostream &out, const ActionTraits &a)
+{
+  out << "ActionTrait(" << &a << ") with " << static_cast<const OptionTrait &>(a) << " has the following options: " << std::endl;
+  for (ActionTraits::options_const_iterator iter = a.getBeginIter();
+    iter != a.getEndIter();
+    ++iter) {
+    out << "\t - " << *iter->second << ")" << std::endl;
+  }
+  return out;
+}
 

src/Actions/ActionTraits.hpp

@@ -14 +14 @@
 #endif
 
+#include <iosfwd>
 #include <map>
 
@@ -81 +82 @@
 }
 
+std::ostream &operator<<(std::ostream &out, const MoleCuilder::ActionTraits &a);
+
 #endif /* ACTIONTRAITS_HPP_ */

src/Actions/OptionTrait.cpp

@@ -145 +145 @@
   ShortForm = _shortform;
 }
+
+/** Output operator for OptionTrait.
+ *
+ * \param &out output stream to print to.
+ */
+std::ostream& operator<<(std::ostream &out, const OptionTrait &t)
+{
+  out << "OptionTrait(" << &t << "): Name(" << t.getName() << ")";
+  out << ", Type(" << t.getTypeName() << ")";
+  out << ", Default(" << t.getDefaultValue() << ")";
+  out << ", ShortForm(" << t.getShortForm() << ")";
+  out << "." << std::endl;
+  return out;
+}

src/Actions/OptionTrait.hpp

@@ -17 +17 @@
 #include <string>
 #include <typeinfo>
+#include <iosfwd>
 
 namespace MoleCuilder {
@@ -55 +56 @@
 }
 
+std::ostream& operator<<(std::ostream &out, const MoleCuilder::OptionTrait &t);
+
 #endif /* OPTIONTRAIT_HPP_ */