Changeset 1f66c7

Timestamp:

Nov 12, 2012, 4:04:54 PM (12 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:

dde8ec

Parents:

286e36

git-author:

Frederik Heber <heber@…> (07/30/12 08:54:19)

git-committer:

Frederik Heber <heber@…> (11/12/12 16:04:54)

Message:

Renamed and extracted namespace FusionKeyNames -> printKeyNames.

• also renamed related file MPQCData_printName -> MPQCData_printKeyNames.

Location:

src

Files:

• Actions/FragmentationAction/FragmentationAutomationAction.cpp (modified) (1 diff)
• Fragmentation/Summation/Makefile.am (modified) (1 diff)
• Fragmentation/Summation/printKeyNames.hpp (added)
• Fragmentation/Summation/printSum.hpp (modified) (2 diffs)
• Jobs/MPQCData_printKeyNames.hpp (moved) (moved from src/Jobs/MPQCData_printName.hpp ) (6 diffs)
• Jobs/Makefile.am (modified) (1 diff)

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -59 +59 @@
 #include "Jobs/MPQCJob.hpp"
 #include "Jobs/MPQCData.hpp"
-#include "Jobs/MPQCData_printName.hpp"
+#include "Jobs/MPQCData_printKeyNames.hpp"
 #include "molecule.hpp"
 #include "World.hpp"

src/Fragmentation/Summation/Makefile.am

@@ -11 +11 @@
         Fragmentation/Summation/OrthogonalSummation.hpp \
         Fragmentation/Summation/OrthogonalSummation_impl.hpp \
+        Fragmentation/Summation/printKeyNames.hpp \
         Fragmentation/Summation/printSum.hpp \
         Fragmentation/Summation/SetValue.hpp \

src/Fragmentation/Summation/printSum.hpp

@@ -20 +20 @@
 #include "Fragmentation/Summation/Summator.hpp"
 
-/** Specific namespace for all the specialized template functions that print
- * a useful name for each of the boost::fusion::map key.
- */
-namespace FusionKeyNames {
+#include "Fragmentation/Summation/printKeyNames.hpp"
 
-  /** This function needs to be specialized for every member variable in your
-   * boost::fusion::map of values to sum up each such that it prints the name
-   * of the member variable.
-   *
-   * By default, we just return an empty string.
-   */
-  template <typename T> std::string printName() {
-    return std::string();
-  };
-
-}
 /** Tiny template functor to use OrthogonalSummation, sum up and print the result.
  *
@@ -80 +66 @@
     MapValue value = sum_value();
     // print value
-    LOG(0, "STATUS: Resulting " << FusionKeyNames::printName<MapKey>() << " is " << value << ".");
+    LOG(0, "STATUS: Resulting " << printKeyNames::printName<MapKey>() << " is " << value << ".");
   }
 

src/Jobs/MPQCData_printKeyNames.hpp

@@ -1 +1 @@
 /*
- * MPQCData_printName.hpp
+ * MPQCData_printKeyNames.hpp
  *
  *  Created on: 28.07.2012
@@ -6 +6 @@
  */
 
-#ifndef MPQCDATA_PRINTNAME_HPP_
-#define MPQCDATA_PRINTNAME_HPP_
+#ifndef MPQCDATA_PRINTKEYNAMES_HPP_
+#define MPQCDATA_PRINTKEYNAMES_HPP_
 
 // include config.h
@@ -27 +27 @@
  * Basically, every key appears here in brackets. If so, then the preprocessor magic
  * below will create a template specialization of the printName() function in the
- * namespace FusionKeyNames.
+ * namespace printKeyNames.
  */
 #define tokensequence \
@@ -60 +60 @@
  * a useful name for each of the boost::fusion::map key.
  */
-namespace FusionKeyNames {
+namespace printKeyNames {
   /* iterate (line-wise) over the sequence and spill out a specialized printName
    * for each member in the boost::fusion::map.
@@ -70 +70 @@
 #endif
 
-}; /* namespace FusionKeyNames */
+}; /* namespace printKeyNames */
 
 #undef tokensequence
@@ -77 +77 @@
 #undef MAXTOKENS
 
-#endif /* MPQCDATA_PRINTNAME_HPP_ */
+#endif /* MPQCDATA_PRINTKEYNAMES_HPP_ */

src/Jobs/Makefile.am

@@ -12 +12 @@
         Jobs/MPQCDataFused.hpp \
         Jobs/MPQCDataMap.hpp \
-        Jobs/MPQCData_printName.hpp \
+        Jobs/MPQCData_printKeyNames.hpp \
         Jobs/MPQCJob.hpp