Changeset d223d5 for src/LinearAlgebra

Timestamp:

Aug 6, 2010, 9:34:59 AM (15 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:

311d688

Parents:

b6da28 (diff), 255971 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Frederik Heber <heber@…> (08/06/10 09:24:26)

git-committer:

Frederik Heber <heber@…> (08/06/10 09:34:59)

Message:

Merge branch 'SharedLibraries' into stable

• BUGFIX: MemDebug.cpp in case of no MEMDEBUG defined, iosfwd include was missing.

Conflicts:

src/Actions/AnalysisAction/PointCorrelationAction.hpp
src/Actions/Makefile.am
src/Makefile.am
src/UIElements/Makefile.am
src/unittests/Makefile.am
src/unittests/ShapeUnittest.cpp

• Mostly took over stuff from branch SharedLibraries as ..LIBS statments in Makefile.ams changed.
• target unity always put at very end, added also to Exceptions, LinearAlgebra, Parser
• ShapeUnittest lacked changes of files moved to LinearAlgebra

Location:

src/LinearAlgebra

Files:

• Line.cpp (moved) (moved from src/Line.cpp ) (1 diff)
• Line.hpp (moved) (moved from src/Line.hpp ) (1 diff)
• Makefile.am (added)
• Matrix.cpp (moved) (moved from src/Matrix.cpp ) (1 diff)
• Matrix.hpp (moved) (moved from src/Matrix.hpp )
• MatrixContent.hpp (moved) (moved from src/MatrixContent.hpp )
• Plane.cpp (moved) (moved from src/Plane.cpp ) (1 diff)
• Plane.hpp (moved) (moved from src/Plane.hpp ) (1 diff)
• Space.cpp (moved) (moved from src/Space.cpp ) (1 diff)
• Space.hpp (moved) (moved from src/Space.hpp )
• Vector.cpp (moved) (moved from src/vector.cpp ) (1 diff)
• Vector.hpp (moved) (moved from src/vector.hpp ) (1 diff)
• VectorContent.hpp (moved) (moved from src/VectorContent.hpp )
• VectorSet.hpp (moved) (moved from src/VectorSet.hpp ) (1 diff)
• gslmatrix.cpp (moved) (moved from src/gslmatrix.cpp ) (1 diff)
• gslmatrix.hpp (moved) (moved from src/gslmatrix.hpp )
• gslvector.cpp (moved) (moved from src/gslvector.cpp ) (1 diff)
• gslvector.hpp (moved) (moved from src/gslvector.hpp )
• linearsystemofequations.cpp (moved) (moved from src/linearsystemofequations.cpp ) (1 diff)
• linearsystemofequations.hpp (moved) (moved from src/linearsystemofequations.hpp )

src/LinearAlgebra/Line.cpp ¶

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Line.hpp"
+#include "LinearAlgebra/Line.hpp"
 
 #include <cmath>
 
-#include "vector.hpp"
-#include "log.hpp"
-#include "verbose.hpp"
-#include "gslmatrix.hpp"
-#include "info.hpp"
+#include "LinearAlgebra/Vector.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
+#include "LinearAlgebra/gslmatrix.hpp"
+#include "Helpers/Info.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
 #include "Exceptions/SkewException.hpp"
-#include "Plane.hpp"
+#include "LinearAlgebra/Plane.hpp"
 
 using namespace std;

src/LinearAlgebra/Line.hpp ¶

@@ -9 +9 @@
 #define LINE_HPP_
 
-#include "Space.hpp"
+#include "LinearAlgebra/Space.hpp"
 
 #include <memory>

src/LinearAlgebra/Matrix.cpp ¶

@@ -6 +6 @@
  */
 
-#include "Matrix.hpp"
+#include "LinearAlgebra/Matrix.hpp"
 #include "Helpers/Assert.hpp"
 #include "Exceptions/NotInvertibleException.hpp"
 #include "Helpers/fast_functions.hpp"
 #include "Helpers/Assert.hpp"
-#include "vector.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include "VectorContent.hpp"
 #include "MatrixContent.hpp"

src/LinearAlgebra/Plane.cpp ¶

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Plane.hpp"
-#include "vector.hpp"
+#include "LinearAlgebra/Plane.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include "defs.hpp"
-#include "info.hpp"
-#include "log.hpp"
-#include "verbose.hpp"
+#include "Helpers/Info.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
 #include "Helpers/Assert.hpp"
 #include <cmath>
-#include "Line.hpp"
+#include "LinearAlgebra/Line.hpp"
 #include "Exceptions/MultipleSolutionsException.hpp"
 

src/LinearAlgebra/Plane.hpp ¶

@@ -12 +12 @@
 #include <vector>
 #include <iosfwd>
-#include "Space.hpp"
+#include "LinearAlgebra/Space.hpp"
 #include "Exceptions/LinearDependenceException.hpp"
 #include "Exceptions/ZeroVectorException.hpp"

src/LinearAlgebra/Space.cpp ¶

@@ -8 +8 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Space.hpp"
-#include "vector.hpp"
+#include "LinearAlgebra/Space.hpp"
+#include "LinearAlgebra/Vector.hpp"
 
 Space::Space()

src/LinearAlgebra/Vector.cpp ¶

@@ -7 +7 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "vector.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include "VectorContent.hpp"
-#include "verbose.hpp"
+#include "Helpers/Verbose.hpp"
 #include "World.hpp"
 #include "Helpers/Assert.hpp"

src/LinearAlgebra/Vector.hpp ¶

@@ -17 +17 @@
 
 #include "defs.hpp"
-#include "Space.hpp"
+#include "LinearAlgebra/Space.hpp"
 
 /********************************************** declarations *******************************/

src/LinearAlgebra/VectorSet.hpp ¶

@@ -20 +20 @@
  */
 
-#include "vector.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include <list>
 

src/LinearAlgebra/gslmatrix.cpp ¶

@@ -10 +10 @@
 using namespace std;
 
-#include "gslmatrix.hpp"
-#include "helpers.hpp"
+#include "LinearAlgebra/gslmatrix.hpp"
+#include "Helpers/helpers.hpp"
 #include "Helpers/fast_functions.hpp"
 

src/LinearAlgebra/gslvector.cpp ¶

@@ -12 +12 @@
 #include <iostream>
 
-#include "gslvector.hpp"
+#include "LinearAlgebra/gslvector.hpp"
 #include "defs.hpp"
-#include "vector.hpp"
+#include "LinearAlgebra/Vector.hpp"
 #include "VectorContent.hpp"
 

src/LinearAlgebra/linearsystemofequations.cpp ¶

@@ -9 +9 @@
 
 #include "defs.hpp"
-#include "gslmatrix.hpp"
-#include "gslvector.hpp"
-#include "linearsystemofequations.hpp"
-#include "logger.hpp"
-#include "vector.hpp"
+#include "LinearAlgebra/gslmatrix.hpp"
+#include "LinearAlgebra/gslvector.hpp"
+#include "LinearAlgebra/linearsystemofequations.hpp"
+#include "Helpers/logger.hpp"
+#include "LinearAlgebra/Vector.hpp"
 
 #include <cassert>