Changeset 5b4605 for src/LinearAlgebra/Matrix.cpp

Timestamp:

Aug 7, 2010, 1:59:43 PM (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:

97b825

Parents:

88b400

Message:

operator[+-*] return const instance [Meyer, "Effective C++", item 21].

• class Vector had this correct, class Matrix not (also for *=,+=).

File:

• src/LinearAlgebra/Matrix.cpp (modified) (5 diffs)

src/LinearAlgebra/Matrix.cpp

@@ -115 +115 @@
 }
 
-Matrix &Matrix::operator+=(const Matrix &rhs){
+const Matrix &Matrix::operator+=(const Matrix &rhs){
   gsl_matrix_add(content->content, rhs.content->content);
   return *this;
 }
 
-Matrix &Matrix::operator-=(const Matrix &rhs){
+const Matrix &Matrix::operator-=(const Matrix &rhs){
   gsl_matrix_sub(content->content, rhs.content->content);
   return *this;
 }
 
-Matrix &Matrix::operator*=(const Matrix &rhs){
+const Matrix &Matrix::operator*=(const Matrix &rhs){
   (*this) = (*this)*rhs;
   return *this;
 }
 
-Matrix Matrix::operator+(const Matrix &rhs) const{
+const Matrix Matrix::operator+(const Matrix &rhs) const{
   Matrix tmp = *this;
   tmp+=rhs;
@@ -136 +136 @@
 }
 
-Matrix Matrix::operator-(const Matrix &rhs) const{
+const Matrix Matrix::operator-(const Matrix &rhs) const{
   Matrix tmp = *this;
   tmp-=rhs;
@@ -142 +142 @@
 }
 
-Matrix Matrix::operator*(const Matrix &rhs) const{
+const Matrix Matrix::operator*(const Matrix &rhs) const{
   gsl_matrix *res = gsl_matrix_alloc(NDIM, NDIM);
   gsl_blas_dgemm(CblasNoTrans, CblasNoTrans, 1.0, content->content, rhs.content->content, 0.0, res);
@@ -257 +257 @@
 }
 
-Matrix &Matrix::operator*=(const double factor){
+const Matrix &Matrix::operator*=(const double factor){
   gsl_matrix_scale(content->content, factor);
   return *this;
 }
 
-Matrix operator*(const double factor,const Matrix& mat){
+const Matrix operator*(const double factor,const Matrix& mat){
   Matrix tmp = mat;
   tmp*=factor;
@@ -268 +268 @@
 }
 
-Matrix operator*(const Matrix &mat,const double factor){
+const Matrix operator*(const Matrix &mat,const double factor){
   return factor*mat;
 }