Changeset bf4b9f for LinearAlgebra/src/unittests

Timestamp:

Apr 8, 2011, 3:48:50 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:

ca2cfa

Parents:

3e2225f

git-author:

Frederik Heber <heber@…> (04/02/11 00:53:43)

git-committer:

Frederik Heber <heber@…> (04/08/11 15:48:50)

Message:

Moved LinearAlgebra from folder src/ into distinct sub-package.

• src/LinearAlgebra folder is now LinearAlgebra/src/LinearAlgebra due to include consistency.
• src/LinearAlgebra/unittests have been moved to LinearAlgebra/unittests.
• All Makefile.am's had to be changed due to changed location of library.
• renamed libMolecuilderLinearAlgebra to libLinearAlgebra.
• CONFIG_AUX_DIR is build-aux 9for molecuilder and LinearAlgebra).
• m4 is symlinked from below.
• build-aux now contains small README such that it is created automatically.

Location:

LinearAlgebra/src/unittests

Files:

• LineUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/LineUnitTest.cpp ) (1 diff)
• LineUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/LineUnitTest.hpp ) (1 diff)
• LinearSystemOfEquationsUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.cpp ) (1 diff)
• LinearSystemOfEquationsUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/LinearSystemOfEquationsUnitTest.hpp ) (1 diff)
• Makefile.am (moved) (moved from src/LinearAlgebra/unittests/Makefile.am ) (3 diffs)
• MatrixContentSymmetricUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.cpp ) (1 diff)
• MatrixContentSymmetricUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/MatrixContentSymmetricUnitTest.hpp )
• MatrixContentUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/MatrixContentUnitTest.cpp ) (1 diff)
• MatrixContentUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/MatrixContentUnitTest.hpp )
• MatrixUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/MatrixUnitTest.cpp ) (1 diff)
• MatrixUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/MatrixUnitTest.hpp )
• PlaneUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/PlaneUnitTest.cpp ) (1 diff)
• PlaneUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/PlaneUnitTest.hpp ) (1 diff)
• TestRunnerMain.cpp (added)
• UnitTestMain.cpp (added)
• VectorContentUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/VectorContentUnitTest.cpp )
• VectorContentUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/VectorContentUnitTest.hpp ) (1 diff)
• VectorUnitTest.cpp (moved) (moved from src/LinearAlgebra/unittests/VectorUnitTest.cpp ) (1 diff)
• VectorUnitTest.hpp (moved) (moved from src/LinearAlgebra/unittests/VectorUnitTest.hpp ) (1 diff)

LinearAlgebra/src/unittests/LineUnitTest.cpp

@@ -19 +19 @@
 
 
-#include "LinearAlgebra/Exceptions.hpp"
-#include "LinearAlgebra/Vector.hpp"
+#include "Exceptions.hpp"
+#include "Vector.hpp"
 
 #include <cppunit/CompilerOutputter.h>

LinearAlgebra/src/unittests/LineUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LinearAlgebra/Line.hpp"
+#include "Line.hpp"
 
 class LineUnittest : public CppUnit::TestFixture

LinearAlgebra/src/unittests/LinearSystemOfEquationsUnitTest.cpp

@@ -26 +26 @@
 #include <cmath>
 
-#include "LinearAlgebra/defs.hpp"
-#include "LinearAlgebra/Vector.hpp"
+#include "defs.hpp"
+#include "Vector.hpp"
 
 #include "LinearSystemOfEquationsUnitTest.hpp"

LinearAlgebra/src/unittests/LinearSystemOfEquationsUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LinearAlgebra/LinearSystemOfEquations.hpp"
+#include "LinearSystemOfEquations.hpp"
 
 /********************************************** Test classes **************************************/

LinearAlgebra/src/unittests/Makefile.am

@@ -2 +2 @@
 # Also indentation by a single tab
 
-INCLUDES = -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)/src/LinearAlgebra
 
 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
@@ -19 +19 @@
 
 check_PROGRAMS = $(TESTS) 
-noinst_PROGRAMS = $(TESTS)
+noinst_PROGRAMS = $(TESTS) TestRunner
 
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 GSLLIBS = \
-        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
+        ../LinearAlgebra/libLinearAlgebra.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
 
-LinearSystemOfEquationsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+TESTSOURCES = \
+        LinearSystemOfEquationsUnitTest.cpp \
+        LineUnitTest.cpp \
+        MatrixContentSymmetricUnitTest.cpp \
+        MatrixContentUnitTest.cpp \
+        MatrixUnitTest.cpp \
+        PlaneUnitTest.cpp \
+        VectorContentUnitTest.cpp \
+        VectorUnitTest.cpp
+
+TESTHEADERS = \
+        LinearSystemOfEquationsUnitTest.hpp \
+        LineUnitTest.hpp \
+        MatrixContentSymmetricUnitTest.hpp \
+        MatrixContentUnitTest.hpp \
+        MatrixUnitTest.hpp \
+        PlaneUnitTest.hpp \
+        VectorContentUnitTest.hpp \
+        VectorUnitTest.hpp 
+
+LinearSystemOfEquationsUnitTest_SOURCES = UnitTestMain.cpp \
         LinearSystemOfEquationsUnitTest.cpp \
         LinearSystemOfEquationsUnitTest.hpp
 LinearSystemOfEquationsUnitTest_LDADD = ${GSLLIBS}
 
-LineUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+LineUnitTest_SOURCES = UnitTestMain.cpp \
         LineUnitTest.cpp \
         LineUnitTest.hpp
 LineUnitTest_LDADD = ${GSLLIBS}
 
-MatrixContentSymmetricUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MatrixContentSymmetricUnitTest_SOURCES = UnitTestMain.cpp \
         MatrixContentSymmetricUnitTest.cpp \
         MatrixContentSymmetricUnitTest.hpp
 MatrixContentSymmetricUnitTest_LDADD = ${GSLLIBS}
 
-MatrixContentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MatrixContentUnitTest_SOURCES = UnitTestMain.cpp \
         MatrixContentUnitTest.cpp \
         MatrixContentUnitTest.hpp
 MatrixContentUnitTest_LDADD = ${GSLLIBS}
 
-MatrixUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+MatrixUnitTest_SOURCES = UnitTestMain.cpp \
         MatrixUnitTest.cpp \
         MatrixUnitTest.hpp
 MatrixUnitTest_LDADD = ${GSLLIBS}
 
-PlaneUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+PlaneUnitTest_SOURCES = UnitTestMain.cpp \
         PlaneUnitTest.cpp \
         PlaneUnitTest.hpp
 PlaneUnitTest_LDADD = ${GSLLIBS}
 
-VectorContentUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+VectorContentUnitTest_SOURCES = UnitTestMain.cpp \
         VectorContentUnitTest.cpp \
         VectorContentUnitTest.hpp
 VectorContentUnitTest_LDADD = ${GSLLIBS}
 
-VectorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+VectorUnitTest_SOURCES = UnitTestMain.cpp \
         VectorUnitTest.cpp \
         VectorUnitTest.hpp 
@@ -68 +88 @@
 
 
+TestRunner_SOURCES = TestRunnerMain.cpp $(TESTSOURCES) $(TESTHEADERS)
+TestRunner_LDADD = ${GSLLIBS}
+
 #AUTOMAKE_OPTIONS = parallel-tests

LinearAlgebra/src/unittests/MatrixContentSymmetricUnitTest.cpp

@@ -26 +26 @@
 #include "MatrixContentSymmetricUnitTest.hpp"
 
-#include "LinearAlgebra/MatrixContent.hpp"
+#include "MatrixContent.hpp"
 
 #ifdef HAVE_TESTRUNNER

LinearAlgebra/src/unittests/MatrixContentUnitTest.cpp

@@ -26 +26 @@
 #include "MatrixContentUnitTest.hpp"
 
-#include "LinearAlgebra/MatrixContent.hpp"
+#include "MatrixContent.hpp"
 
 #ifdef HAVE_TESTRUNNER

LinearAlgebra/src/unittests/MatrixUnitTest.cpp

@@ -27 +27 @@
 #include "MatrixUnitTest.hpp"
 
-#include "LinearAlgebra/defs.hpp"
-#include "LinearAlgebra/Exceptions.hpp"
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
-#include "LinearAlgebra/Vector.hpp"
+#include "defs.hpp"
+#include "Exceptions.hpp"
+#include "RealSpaceMatrix.hpp"
+#include "Vector.hpp"
 
 #ifdef HAVE_TESTRUNNER

LinearAlgebra/src/unittests/PlaneUnitTest.cpp

@@ -25 +25 @@
 #include <limits>
 
-#include "LinearAlgebra/defs.hpp"
-#include "LinearAlgebra/Exceptions.hpp"
-#include "LinearAlgebra/Line.hpp"
-#include "LinearAlgebra/Vector.hpp"
+#include "defs.hpp"
+#include "Exceptions.hpp"
+#include "Line.hpp"
+#include "Vector.hpp"
 
 #include "PlaneUnitTest.hpp"

LinearAlgebra/src/unittests/PlaneUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LinearAlgebra/Plane.hpp"
+#include "Plane.hpp"
 
 class PlaneUnittest : public CppUnit::TestFixture

LinearAlgebra/src/unittests/VectorContentUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LinearAlgebra/VectorContent.hpp"
+#include "VectorContent.hpp"
 
 /********************************************** Test classes **************************************/

LinearAlgebra/src/unittests/VectorUnitTest.cpp

@@ -27 +27 @@
 
 #include "CodePatterns/Log.hpp"
-#include "LinearAlgebra/defs.hpp"
-#include "LinearAlgebra/Plane.hpp"
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
-#include "LinearAlgebra/Vector.hpp"
-#include "LinearAlgebra/vector_ops.hpp"
+#include "defs.hpp"
+#include "Plane.hpp"
+#include "RealSpaceMatrix.hpp"
+#include "Vector.hpp"
+#include "vector_ops.hpp"
 
 #include "VectorUnitTest.hpp"

LinearAlgebra/src/unittests/VectorUnitTest.hpp

@@ -17 +17 @@
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LinearAlgebra/Vector.hpp"
+#include "Vector.hpp"
 
 /********************************************** Test classes **************************************/