Changeset f10b0c for src/Parameters

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/Parameters

Files:

• Parameter.hpp (modified) (2 diffs)
• Parameter_impl.hpp (modified) (1 diff)
• StreamOperators.hpp (added)
• Value.hpp (modified) (2 diffs)
• Value_impl.hpp (modified) (1 diff)
• VectorFromString.hpp (deleted)
• unittests/Makefile.am (modified) (2 diffs)

src/Parameters/Parameter.hpp

@@ -28 +28 @@
 {
 public:
+  Parameter(const Parameter<T> &instance);
   Parameter(const std::string &_name);
   Parameter(const std::string &_name, const T &_value);
@@ -45 +46 @@
   ParameterAsString* clone() const;
 
-private:
+//private: // TODO...
   Parameter();
 };

src/Parameters/Parameter_impl.hpp

@@ -15 +15 @@
 
 #include "Parameter.hpp"
+
+
+
+template<typename T>
+Parameter<T>::Parameter(const Parameter<T> &instance) :
+  ParameterInterface<T>(instance.getName()),
+  Value<T>(instance.getValidator())
+{
+  Value<T>::set(instance.Value<T>::get());
+}
+
+/** Constructor for class Parameter.
+ *
+ */
+template<typename T>
+Parameter<T>::Parameter() :
+  ParameterInterface<T>("__no_name__"),
+  Value<T>()
+{};
 
 /** Constructor for class Parameter.

src/Parameters/Value.hpp

@@ -21 +21 @@
 #include "Validators/Validator.hpp"
 
+#include "StreamOperators.hpp"
+
 #include "CodePatterns/Range.hpp"
 #include "CodePatterns/toString.hpp"
-
-#include "VectorFromString.hpp"
 
 class ValueTest;
@@ -58 +58 @@
 
   // comfortable setter
-  void operator=(const T &_value)
-  { set(_value);  }
+  Value<T> &operator=(const T &_value)
+  { set(_value);  return *this;  }
 
   // comparator

src/Parameters/Value_impl.hpp

@@ -25 +25 @@
 #include "Validators/DiscreteValidator.hpp"
 #include "Validators/RangeValidator.hpp"
+
+
 
 // static member

src/Parameters/unittests/Makefile.am

@@ -31 +31 @@
         ../Parameters/unittests/ContinuousValueTest.cpp \
         ../Parameters/unittests/ContinuousValueTest.hpp \
+        ../Parameters/StreamOperators.hpp \
         ../Parameters/Validators/DiscreteValidator.hpp \
         ../Parameters/Validators/DiscreteValidator_impl.hpp \
@@ -40 +41 @@
         ../Parameters/Value_impl.hpp \
         ../Parameters/ValueAsString.hpp \
-        ../Parameters/ValueInterface.hpp \
-        ../Parameters/VectorFromString.hpp
+        ../Parameters/ValueInterface.hpp
 ContinuousValueTest_LDADD = \
         $(PARAMETERSLIBS) \