Changeset cca9ef for src/Shapes

Timestamp:

Dec 4, 2010, 11:54:32 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:

0d4424

Parents:

3bc926

git-author:

Frederik Heber <heber@…> (11/15/10 12:58:27)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:54:32)

Message:

Renamed Matrix to RealSpaceMatrix.

• class Matrix only represents 3x3 matrices, whereas we are now going to extend the class MatrixContent to contain arbritrary dimensions.
• renamed class and file

Location:

src/Shapes

Files:

• ShapeOps.cpp (modified) (3 diffs)
• ShapeOps.hpp (modified) (1 diff)
• ShapeOps_impl.hpp (modified) (3 diffs)

src/Shapes/ShapeOps.cpp

@@ -233 +233 @@
 /************************* transform *****************/
 
-Transform_impl::Transform_impl(const Shape::impl_ptr &_arg, const Matrix &_transformation) :
+Transform_impl::Transform_impl(const Shape::impl_ptr &_arg, const RealSpaceMatrix &_transformation) :
   ShapeOpsBase_impl(_arg),transformation(_transformation)
 {
@@ -254 +254 @@
 
 Vector Transform_impl::translateOutNormal(const Vector& point){
-  Matrix mat = transformation.invert().transpose();
+  RealSpaceMatrix mat = transformation.invert().transpose();
   return mat * point;
 }
@@ -272 +272 @@
 }
 
-Shape transform(const Shape &arg, const Matrix &transformation){
+Shape transform(const Shape &arg, const RealSpaceMatrix &transformation){
   Shape::impl_ptr impl = Shape::impl_ptr(new Transform_impl(getShapeImpl(arg),transformation));
   return Shape(impl);

src/Shapes/ShapeOps.hpp

@@ -11 +11 @@
 #include "Shapes/Shape.hpp"
 
-class Matrix;
+class RealSpaceMatrix;
 
 Shape resize(const Shape&,double);
 Shape translate(const Shape&, const Vector&);
 Shape stretch(const Shape&, const Vector&);
-Shape transform(const Shape&,const Matrix&);
+Shape transform(const Shape&,const RealSpaceMatrix&);
 
 #endif /* SHAPEOPS_HPP_ */

src/Shapes/ShapeOps_impl.hpp

@@ -11 +11 @@
 #include "Shapes/Shape_impl.hpp"
 #include "LinearAlgebra/Vector.hpp"
-#include "LinearAlgebra/Matrix.hpp"
+#include "LinearAlgebra/RealSpaceMatrix.hpp"
 
 #include <vector>
@@ -87 +87 @@
 {
 public:
-  Transform_impl(const Shape::impl_ptr&, const Matrix&);
+  Transform_impl(const Shape::impl_ptr&, const RealSpaceMatrix&);
   virtual ~Transform_impl();
 protected:
@@ -97 +97 @@
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 private:
-  Matrix transformation;
-  Matrix transformationInv;
+  RealSpaceMatrix transformation;
+  RealSpaceMatrix transformationInv;
 };