Changeset 6e06bd for src/unittests/VectorContentUnittest.cpp

Timestamp:

Dec 5, 2010, 12:19:19 AM (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:

f03705

Parents:

589112 (diff), bbf1bd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'MatrixVectorContentRefactoring' into stable

File:

• src/unittests/VectorContentUnittest.cpp (moved) (moved from src/unittests/gslvectorunittest.cpp ) (9 diffs)

src/unittests/VectorContentUnittest.cpp

@@ -7 +7 @@
 
 /*
- * gslvectorunittest.cpp
+ * VectorContentUnittest.cpp
  *
  *  Created on: Jan 8, 2010
@@ -24 +24 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "gslvectorunittest.hpp"
+#include "VectorContentUnittest.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -33 +33 @@
 
 // Registers the fixture into the 'registry'
-CPPUNIT_TEST_SUITE_REGISTRATION( GSLVectorTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( VectorContentTest );
 
 
-void GSLVectorTest::setUp()
+void VectorContentTest::setUp()
 {
-  v = new GSLVector(3);
+  v = new VectorContent(3);
 };
 
-void GSLVectorTest::tearDown()
+void VectorContentTest::tearDown()
 {
   delete(v);
@@ -49 +49 @@
  *
  */
-void GSLVectorTest::AccessTest()
+void VectorContentTest::AccessTest()
 {
   // set
   for (int i=0;i<3;i++)
-    v->Set(i,i);
+    v->at(i) = (double)i;
 
   // and check
   double *ptr = NULL;
   for (int i=0;i<3;i++) {
-    CPPUNIT_ASSERT_EQUAL( (double)i, v->Get(i) );
+    CPPUNIT_ASSERT_EQUAL( (double)i, v->at(i) );
     ptr = v->Pointer(i);
     CPPUNIT_ASSERT_EQUAL( (double)i, *ptr );
@@ -64 +64 @@
 
   // out of bounds
-  //CPPUNIT_ASSERT_EQUAL(0., v->Get(3) );
-  //CPPUNIT_ASSERT_EQUAL(0., v->Get(-1) );
+  //CPPUNIT_ASSERT_EQUAL(0., v->at(3) );
+  //CPPUNIT_ASSERT_EQUAL(0., v->at(-1) );
 };
 
@@ -72 +72 @@
  *
  */
-void GSLVectorTest::InitializaionTest()
+void VectorContentTest::InitializaionTest()
 {
   // set zero
-  v->SetZero();
+  v->setZero();
   for (int i=0;i<3;i++)
-    CPPUNIT_ASSERT_EQUAL( 0., v->Get(i) );
+    CPPUNIT_ASSERT_EQUAL( 0., v->at(i) );
 
   // set basis
   for (int i=0;i<3;i++) {
-    v->SetBasis(i);
+    v->setBasis(i);
     for (int j=0;j<3;j++)
-      CPPUNIT_ASSERT_EQUAL( i == j ? 1. : 0. , v->Get(j) );
+      CPPUNIT_ASSERT_EQUAL( i == j ? 1. : 0. , v->at(j) );
   }
 
   // set all
-  v->SetAll(1.5);
+  v->setValue(1.5);
   for (int i=0;i<3;i++)
-    CPPUNIT_ASSERT_EQUAL( 1.5, v->Get(i) );
+    CPPUNIT_ASSERT_EQUAL( 1.5, v->at(i) );
 };
 
@@ -95 +95 @@
  *
  */
-void GSLVectorTest::CopyTest()
+void VectorContentTest::CopyTest()
 {
   // set basis
-  GSLVector *dest = NULL;
+  VectorContent *dest = NULL;
   for (int i=0;i<3;i++) {
-    v->SetBasis(i);
-    dest = new GSLVector(v);
+    v->setBasis(i);
+    dest = new VectorContent(v);
     for (int j=0;j<3;j++)
-      CPPUNIT_ASSERT_EQUAL( v->Get(j) , dest->Get(j) );
+      CPPUNIT_ASSERT_EQUAL( v->at(j) , dest->at(j) );
 
     delete(dest);
@@ -112 +112 @@
  *
  */
-void GSLVectorTest::ExchangeTest()
+void VectorContentTest::ExchangeTest()
 {
   // set basis
   for (int i=0;i<3;i++) {
-    v->SetBasis(i);
+    v->setBasis(i);
     v->SwapElements((i)%3,(i+1)%3);
     for (int j=0;j<3;j++)
-      CPPUNIT_ASSERT_EQUAL( (i+1)%3 == j ? 1. : 0. , v->Get(j) );
+      CPPUNIT_ASSERT_EQUAL( (i+1)%3 == j ? 1. : 0. , v->at(j) );
   }
 
   // set to 1,2,3 and reverse
   for (int i=0;i<3;i++)
-    v->Set(i,i+1);
+    v->at(i) = (double)(i+1);
   v->Reverse();
   for (int j=0;j<3;j++)
-    CPPUNIT_ASSERT_EQUAL( (double)(3-j), v->Get(j) );
+    CPPUNIT_ASSERT_EQUAL( (double)(3-j), v->at(j) );
 };
 
 /** UnitTest for operators.
  */
-void GSLVectorTest::OperatorIsTest()
+void VectorContentTest::OperatorIsTest()
 {
-  GSLVector zero(3);
-  GSLVector unit(3);
-  zero.SetZero();
-  unit.SetZero();
-  unit.Set(1,1.);
+  VectorContent zero(3);
+  VectorContent unit(3);
+  zero.setZero();
+  unit.setZero();
+  unit[1] = 1.;
   // summation and scaling
   CPPUNIT_ASSERT_EQUAL( true, unit.IsOne() );
@@ -148 +148 @@
 /** UnitTest for operators.
  */
-void GSLVectorTest::OperatorAlgebraTest()
+void VectorContentTest::OperatorAlgebraTest()
 {
-  GSLVector zero(3);
-  GSLVector unit(3);
-  zero.SetZero();
-  unit.SetZero();
-  unit.Set(1,1.);
+  VectorContent zero(3);
+  VectorContent unit(3);
+  zero.setZero();
+  unit.setZero();
+  unit[1] = 1.;
   // summation and scaling
   CPPUNIT_ASSERT_EQUAL( true, (zero+unit).IsOne() );