Changeset dfafe7 for src

Timestamp:

Dec 16, 2010, 11:47:45 PM (14 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:

f844ef

Parents:

0b3cbdf

git-author:

Frederik Heber <heber@…> (12/16/10 21:07:59)

git-committer:

Frederik Heber <heber@…> (12/16/10 23:47:45)

Message:

Moved VectorContentUnittest and vectorunittest to LinearAlgebra/unittests/VectorContentUnitTest and ../VectorUnitTest.

Location:

src

Files:

• LinearAlgebra/unittests/Makefile.am (modified) (2 diffs)
• LinearAlgebra/unittests/VectorContentUnitTest.cpp (moved) (moved from src/unittests/VectorContentUnittest.cpp ) (1 diff)
• LinearAlgebra/unittests/VectorContentUnitTest.hpp (moved) (moved from src/unittests/VectorContentUnittest.hpp )
• LinearAlgebra/unittests/VectorUnitTest.cpp (moved) (moved from src/unittests/vectorunittest.cpp ) (2 diffs)
• LinearAlgebra/unittests/VectorUnitTest.hpp (moved) (moved from src/unittests/vectorunittest.hpp )
• unittests/Makefile.am (modified) (4 diffs)

src/LinearAlgebra/unittests/Makefile.am

@@ -14 +14 @@
   MatrixContentUnitTest \
   MatrixUnitTest \
-  PlaneUnitTest
+  PlaneUnitTest \
+  VectorContentUnitTest \
+  VectorUnitTest
 
 
@@ -57 +59 @@
 PlaneUnitTest_LDADD = ${GSLLIBS}
 
+VectorContentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        VectorContentUnitTest.cpp \
+        VectorContentUnitTest.hpp
+VectorContentUnitTest_LDADD = ${GSLLIBS}
+
+VectorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        VectorUnitTest.cpp \
+        VectorUnitTest.hpp 
+VectorUnitTest_LDADD = ${GSLLIBS}
+
 
 #AUTOMAKE_OPTIONS = parallel-tests

src/LinearAlgebra/unittests/VectorContentUnitTest.cpp

@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "VectorContentUnittest.hpp"
+#include "VectorContentUnitTest.hpp"
 
 #ifdef HAVE_TESTRUNNER

src/LinearAlgebra/unittests/VectorUnitTest.cpp

@@ -28 +28 @@
 #include "LinearAlgebra/Vector.hpp"
 #include "LinearAlgebra/vector_ops.hpp"
-#include "vectorunittest.hpp"
 #include "LinearAlgebra/Plane.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 
+#include "VectorUnitTest.hpp"
+
 #ifdef HAVE_TESTRUNNER
 #include "UnitTestMain.hpp"
@@ -38 +39 @@
 
 #include <iostream>
-
-using namespace std;
 
 /********************************************** Test classes **************************************/

src/unittests/Makefile.am

@@ -32 +32 @@
   TesselationUnitTest \
   Tesselation_BoundaryTriangleUnitTest \
-  Tesselation_InOutsideUnitTest \
-  VectorContentUnitTest \
-  VectorUnitTest
+  Tesselation_InOutsideUnitTest
 
 
@@ -93 +91 @@
   tesselation_boundarytriangleunittest.cpp \
   tesselation_insideoutsideunittest.cpp \
-  VectorContentUnittest.cpp \
-  vectorunittest.cpp
+  ../LinearAlgebra/unittests/VectorContentUnitTest.cpp \
+  ../LinearAlgebra/unittests/VectorUnitTest.cpp
 
 TESTHEADERS = \
@@ -134 +132 @@
   tesselation_boundarytriangleunittest.hpp \
   tesselation_insideoutsideunittest.hpp \
-  VectorContentUnittest.hpp \
-  vectorunittest.hpp
+  ../LinearAlgebra/unittests/VectorContentUnitTest.hpp \
+  ../LinearAlgebra/unittests/VectorUnitTest.hpp
   
 
@@ -186 +184 @@
 TestRunner_LDADD = ${UILIBS} ${ALLLIBS}
 
-VectorContentUnitTest_SOURCES = UnitTestMain.cpp VectorContentUnittest.cpp VectorContentUnittest.hpp
-VectorContentUnitTest_LDADD = ${ALLLIBS}
-
-VectorUnitTest_SOURCES = UnitTestMain.cpp vectorunittest.cpp vectorunittest.hpp 
-VectorUnitTest_LDADD = ${ALLLIBS}
-
 #AUTOMAKE_OPTIONS = parallel-tests