Changeset 9eb7580 for src/unittests

Timestamp:

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

3bc926

Parents:

cfc53b

git-author:

Frederik Heber <heber@…> (11/15/10 10:29:25)

git-committer:

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

Message:

Renamed Matrix setter functions to unify naming.

• Matrix::one -> Matrix::setIdentity
• Matrix::zero -> Matrix::setZero
• Matrix::rotation -> Matrix::setRotation

Location:

src/unittests

Files:

• BoxUnittest.cpp (modified) (2 diffs)
• MatrixUnittest.cpp (modified) (3 diffs)

src/unittests/BoxUnittest.cpp

@@ -41 +41 @@
   ASSERT_DO(Assert::Throw);
   unit = new Matrix;
-  unit->one();
+  unit->setIdentity();
   zero = new Matrix;
   invertible = new Matrix;
@@ -52 +52 @@
   unitBox = new Box;
   stretchedBox1 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.diagonal() = Vector(1,2,3);
   stretchedBox1->setM(boxMat);
 
   stretchedBox2 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.diagonal() = Vector(2,3,1);
   stretchedBox2->setM(boxMat);
 
   stretchedBox3 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.diagonal() = Vector(3,1,2);
   stretchedBox3->setM(boxMat);
 
   stretchedBox4 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.diagonal() = Vector(2,2,2);
   stretchedBox4->setM(boxMat);
 
   tiltedBox1 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.column(0) = Vector(1,0,1);
   tiltedBox1->setM(boxMat);
 
   tiltedBox2 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.column(0) = Vector(1,1,1);
   tiltedBox2->setM(boxMat);
 
   tiltedBox3 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.column(1) = Vector(0,1,1);
   tiltedBox3->setM(boxMat);
 
   tiltedBox4 = new Box;
-  boxMat.one();
+  boxMat.setIdentity();
   boxMat.column(0) = Vector(1,1,1);
   boxMat.column(1) = Vector(0,1,1);

src/unittests/MatrixUnittest.cpp

@@ -121 +121 @@
   CPPUNIT_ASSERT_EQUAL(mat.diagonal(),zeroVec);
 
-  mat.one();
+  mat.setIdentity();
   CPPUNIT_ASSERT_EQUAL(mat.row(0),unitVec[0]);
   CPPUNIT_ASSERT_EQUAL(mat.row(1),unitVec[1]);
@@ -171 +171 @@
 
   // transpose of unit is unit
-  res.one();
+  res.setIdentity();
   (const Matrix)res.transpose();
   CPPUNIT_ASSERT_EQUAL(res,*one);
 
   // transpose of transpose is same matrix
-  res.zero();
+  res.setZero();
   res.set(2,2, 1.);
   CPPUNIT_ASSERT_EQUAL(res.transpose().transpose(),res);
@@ -258 +258 @@
 
   // zero rotation angles yields unity matrix
-  res.rotation(0,0,0);
+  res.setRotation(0,0,0);
   CPPUNIT_ASSERT_EQUAL(*one, res);
 
   // arbitrary rotation matrix has det = 1
-  res.rotation(M_PI/3.,1.,M_PI/7.);
+  res.setRotation(M_PI/3.,1.,M_PI/7.);
   CPPUNIT_ASSERT(fabs(fabs(res.determinant()) -1.) < MYEPSILON);
 
   // inverse is rotation matrix with negative angles
-  res.rotation(M_PI/3.,0.,0.);
-  inverse.rotation(-M_PI/3.,0.,0.);
+  res.setRotation(M_PI/3.,0.,0.);
+  inverse.setRotation(-M_PI/3.,0.,0.);
   CPPUNIT_ASSERT_EQUAL(*one, res * inverse);
 
   // ... or transposed
-  res.rotation(M_PI/3.,0.,0.);
+  res.setRotation(M_PI/3.,0.,0.);
   CPPUNIT_ASSERT_EQUAL(inverse, ((const Matrix) res).transpose());
 }