Changeset 84e752 for src/Parser

Timestamp:

Oct 17, 2011, 2:36:56 PM (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:

498ddd

Parents:

a7d753

git-author:

Frederik Heber <heber@…> (09/30/11 09:40:49)

git-committer:

Frederik Heber <heber@…> (10/17/11 14:36:56)

Message:

Moved Continuous- and DiscreteValue into subfolder Parameters.

• this folder is to contain all stuff related to internal parameters of the parsers.

Location:

src/Parser

Files:

• Makefile.am (modified) (2 diffs)
• Parameters/ContinuousValue.hpp (moved) (moved from src/Parser/ContinuousValue.hpp )
• Parameters/ContinuousValue_impl.hpp (moved) (moved from src/Parser/ContinuousValue_impl.hpp )
• Parameters/DiscreteValue.hpp (moved) (moved from src/Parser/DiscreteValue.hpp )
• Parameters/DiscreteValue_impl.hpp (moved) (moved from src/Parser/DiscreteValue_impl.hpp )
• Parameters/ValueInterface.hpp (moved) (moved from src/Parser/ValueInterface.hpp )
• Parameters/unittests/ContinuousValueUnitTest.cpp (moved) (moved from src/Parser/unittests/ContinuousValueUnitTest.cpp ) (1 diff)
• Parameters/unittests/ContinuousValueUnitTest.hpp (moved) (moved from src/Parser/unittests/ContinuousValueUnitTest.hpp )
• Parameters/unittests/DiscreteValueUnitTest.cpp (moved) (moved from src/Parser/unittests/DiscreteValueUnitTest.cpp ) (1 diff)
• Parameters/unittests/DiscreteValueUnitTest.hpp (moved) (moved from src/Parser/unittests/DiscreteValueUnitTest.hpp )
• Parameters/unittests/Makefile.am (added)
• unittests/Makefile.am (modified) (4 diffs)

src/Parser/Makefile.am

@@ -42 +42 @@
   Parser/XyzParser.hpp
 
+PARSERPARAMETERSSOURCE =
+
+PARSERPARAMETERSHEADER = \
+  Parser/Parameters/ContinuousValue.hpp \
+  Parser/Parameters/ContinuousValue_impl.hpp \
+  Parser/Parameters/DiscreteValue.hpp \
+  Parser/Parameters/DiscreteValue_impl.hpp \
+  Parser/Parameters/ValueInterface.hpp
 
 noinst_LTLIBRARIES += libMolecuilderParser.la
 libMolecuilderParser_la_includedir = $(includedir)/MoleCuilder/Parser/
 
-nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER}
+nobase_libMolecuilderParser_la_include_HEADERS = ${PARSERHEADER} ${PARSERPARAMETERSHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -56 +64 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libMolecuilderParser_la_SOURCES = ${PARSERSOURCE}
+libMolecuilderParser_la_SOURCES = ${PARSERSOURCE} ${PARSERPARAMETERSSOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared

src/Parser/Parameters/unittests/ContinuousValueUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parser/ContinuousValue.hpp"
+#include "Parser/Parameters/ContinuousValue.hpp"
 
 #include "CodePatterns/toString.hpp"

src/Parser/Parameters/unittests/DiscreteValueUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Parser/DiscreteValue.hpp"
+#include "Parser/Parameters/DiscreteValue.hpp"
 
 #include "CodePatterns/toString.hpp"

src/Parser/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
+include ../../src/Parser/Parameters/unittests/Makefile.am
 
 PARSERTESTSSOURCES = \
-  ../Parser/unittests/ContinuousValueUnitTest.cpp \
-  ../Parser/unittests/DiscreteValueUnitTest.cpp \
         ../Parser/unittests/ParserMpqcUnitTest.cpp \
         ../Parser/unittests/ParserPcpUnitTest.cpp \
@@ -13 +12 @@
 
 PARSERTESTSHEADERS = \
-  ../Parser/unittests/ContinuousValueUnitTest.hpp \
-  ../Parser/unittests/DiscreteValueUnitTest.hpp \
         ../Parser/unittests/ParserMpqcUnitTest.hpp \
         ../Parser/unittests/ParserPcpUnitTest.hpp \
@@ -22 +19 @@
 
 PARSERTESTS = \
-        ContinuousValueUnitTest \
-  DiscreteValueUnitTest \
   ParserMpqcUnitTest \
   ParserPcpUnitTest \
@@ -41 +36 @@
 
 
-ContinuousValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  ../Parser/unittests/ContinuousValueUnitTest.cpp \
-  ../Parser/unittests/ContinuousValueUnitTest.hpp \
-  ../Parser/ContinuousValue.hpp \
-  ../Parser/ContinuousValue_impl.hpp
-#ContinuousValueUnitTest_LDADD
- 
-DiscreteValueUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
-  ../Parser/unittests/DiscreteValueUnitTest.cpp \
-  ../Parser/unittests/DiscreteValueUnitTest.hpp \
-  ../Parser/DiscreteValue.hpp \
-  ../Parser/DiscreteValue_impl.hpp
-#DiscreteValueUnitTest_LDADD
- 
 ParserMpqcUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../Parser/unittests/ParserMpqcUnitTest.cpp \