Changeset 72e7fa for src/vector.cpp

Timestamp:

Apr 9, 2010, 2:45:49 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

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, Candidate_v1.7.0, 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:

273382

Parents:

0a4f7f

Message:

Started work on the VectorComposites

File:

• src/vector.cpp (modified) (5 diffs)

src/vector.cpp

@@ -431 +431 @@
  * \return a == b
  */
-bool operator==(const Vector& a, const Vector& b)
+bool Vector::operator==(const Vector& b) const
 {
   bool status = true;
   for (int i=0;i<NDIM;i++)
-    status = status && (fabs(a[i] - b[i]) < MYEPSILON);
+    status = status && (fabs((*this)[i] - b[i]) < MYEPSILON);
   return status;
 };
@@ -444 +444 @@
  * \return lhs + a
  */
-const Vector& operator+=(Vector& a, const Vector& b)
-{
-  a.AddVector(&b);
-  return a;
+const Vector& Vector::operator+=(const Vector& b)
+{
+  this->AddVector(&b);
+  return *this;
 };
 
@@ -455 +455 @@
  * \return lhs - a
  */
-const Vector& operator-=(Vector& a, const Vector& b)
-{
-  a.SubtractVector(&b);
-  return a;
+const Vector& Vector::operator-=(const Vector& b)
+{
+  this->SubtractVector(&b);
+  return *this;
 };
 
@@ -477 +477 @@
  * \return a + b
  */
-Vector const operator+(const Vector& a, const Vector& b)
-{
-  Vector x(a);
+Vector const Vector::operator+(const Vector& b) const
+{
+  Vector x = *this;
   x.AddVector(&b);
   return x;
@@ -489 +489 @@
  * \return a - b
  */
-Vector const operator-(const Vector& a, const Vector& b)
-{
-  Vector x(a);
+Vector const Vector::operator-(const Vector& b) const
+{
+  Vector x = *this;
   x.SubtractVector(&b);
   return x;