Changeset e06820 for src/Fragmentation

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:

7d92f1

Parents:

dde8ec

git-author:

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

git-committer:

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

Message:

Renamed Fragmentation/Histogram/ -> Fragmentation/SetValues/

• also moved subfolder unittests.
• changed includes and Makefile.am's.

Location:

src/Fragmentation

Files:

• Histogram/unittests/Makefile.am (deleted)
• SetValues/Histogram.cpp (moved) (moved from src/Fragmentation/Histogram/Histogram.cpp )
• SetValues/Histogram.hpp (moved) (moved from src/Fragmentation/Histogram/Histogram.hpp )
• SetValues/Makefile.am (moved) (moved from src/Fragmentation/Histogram/Makefile.am ) (3 diffs)
• SetValues/unittests/HistogramUnitTest.cpp (moved) (moved from src/Fragmentation/Histogram/unittests/HistogramUnitTest.cpp ) (1 diff)
• SetValues/unittests/HistogramUnitTest.hpp (moved) (moved from src/Fragmentation/Histogram/unittests/HistogramUnitTest.hpp )
• SetValues/unittests/Makefile.am (added)

src/Fragmentation/SetValues/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-FRAGMENTATIONHISTOGRAMSOURCE = \
-        Fragmentation/Histogram/Histogram.cpp
+FRAGMENTATIONSETVALUESSOURCE = \
+        Fragmentation/SetValues/Histogram.cpp
 
-FRAGMENTATIONHISTOGRAMHEADER = \
-        Fragmentation/Histogram/Histogram.hpp
+FRAGMENTATIONSETVALUESHEADER = \
+        Fragmentation/SetValues/Histogram.hpp
 
 
-noinst_LTLIBRARIES += libMolecuilderFragmentationHistogram.la
-libMolecuilderFragmentationHistogram_la_includedir = $(includedir)/MoleCuilder/Fragmentation/Histogram/
-libMolecuilderFragmentationHistogram_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
-libMolecuilderFragmentationHistogram_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
-libMolecuilderFragmentationHistogram_la_LIBADD = \
+noinst_LTLIBRARIES += libMolecuilderFragmentationSetValues.la
+libMolecuilderFragmentationSetValues_la_includedir = $(includedir)/MoleCuilder/Fragmentation/SetValues/
+libMolecuilderFragmentationSetValues_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderFragmentationSetValues_la_LDFLAGS = -ldl ${BOOST_LDFLAGS}
+libMolecuilderFragmentationSetValues_la_LIBADD = \
         ${CodePatterns_LIBS}
 
 
-nobase_libMolecuilderFragmentationHistogram_la_include_HEADERS = ${FRAGMENTATIONHISTOGRAMHEADER}
+nobase_libMolecuilderFragmentationSetValues_la_include_HEADERS = ${FRAGMENTATIONSETVALUESHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -27 +27 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libMolecuilderFragmentationHistogram_la_SOURCES = ${FRAGMENTATIONHISTOGRAMSOURCE}
+libMolecuilderFragmentationSetValues_la_SOURCES = ${FRAGMENTATIONSETVALUESSOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-#libMolecuilderFragmentationHistogram_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+#libMolecuilderFragmentationSetValues_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -45 +45 @@
 ## configuration header file is generated at configure time and should not be
 ## shipped with the source tarball.
-#libMolecuilderFragmentationHistogram_libincludedir = $(libdir)/MoleCuilder/include
-#nodist_libMolecuilderFragmentationHistogram_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+#libMolecuilderFragmentationSetValues_libincludedir = $(libdir)/MoleCuilder/include
+#nodist_libMolecuilderFragmentationSetValues_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for

src/Fragmentation/SetValues/unittests/HistogramUnitTest.cpp

@@ -39 +39 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Fragmentation/Histogram/Histogram.hpp"
+#include "Fragmentation/SetValues/Histogram.hpp"
 
 #include "HistogramUnitTest.hpp"