Changeset ad8b0d

Timestamp:

Oct 17, 2009, 4:49:59 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:

09048c

Parents:

3a9fe9

Message:

Templated version of flip now operates with references instead of pointers.

• vector::SolveSystem() was changed accordingly.

Location:

src

Files:

• helpers.hpp (modified) (1 diff, 1 prop)
• vector.cpp (modified) (2 diffs, 1 prop)

src/helpers.hpp

@@ -55 +55 @@
 
 /** Flips two values.
- * \param *x pointer to first value
- * \param *y pointer to second value
+ * \param x first value
+ * \param y second value
  */
-template <typename T> void flip(T *x, T *y)
+template <typename T> void flip(T &x, T &y)
 {
   T tmp;
-  tmp = *x;
-  *x = *y;
-  *y = tmp;
+  tmp = x;
+  x = y;
+  y = tmp;
 };
 

src/vector.cpp

@@ -1139 +1139 @@
       break;
     case 2:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      //flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      //flip(x[1],x[2]);
     case 1:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      //flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      //flip(x[1],x[2]);
       break;
   }
@@ -1224 +1224 @@
       break;
     case 2:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      flip(x[1],x[2]);
     case 1:
-      flip(&x1->x[0],&x1->x[1]);
-      flip(&x2->x[0],&x2->x[1]);
-      flip(&y->x[0],&y->x[1]);
-      //flip(&x[0],&x[1]);
-      flip(&x1->x[1],&x1->x[2]);
-      flip(&x2->x[1],&x2->x[2]);
-      flip(&y->x[1],&y->x[2]);
-      flip(&x[1],&x[2]);
+      flip(x1->x[0],x1->x[1]);
+      flip(x2->x[0],x2->x[1]);
+      flip(y->x[0],y->x[1]);
+      //flip(x[0],x[1]);
+      flip(x1->x[1],x1->x[2]);
+      flip(x2->x[1],x2->x[2]);
+      flip(y->x[1],y->x[2]);
+      flip(x[1],x[2]);
       break;
   }