Changeset 6f68d6 for src/LinearAlgebra/unittests

Timestamp:

Apr 6, 2011, 1:50:40 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:

cd406d

Parents:

0e4aa4

git-author:

Frederik Heber <heber@…> (03/30/11 20:45:38)

git-committer:

Frederik Heber <heber@…> (04/06/11 13:50:40)

Message:

Added possibility to parse MatrixContent from stream and to write to.

• MatrixContent::preparseMatrixDimensions() needed due to const members rows and columns.
• extended present unit test on both features.

Location:

src/LinearAlgebra/unittests

Files:

• MatrixContentUnitTest.cpp (modified) (1 diff)
• MatrixContentUnitTest.hpp (modified) (2 diffs)

src/LinearAlgebra/unittests/MatrixContentUnitTest.cpp

@@ -266 +266 @@
   CPPUNIT_ASSERT_EQUAL( false, m->IsPositiveDefinite() );
 };
+
+
+/** Unit test for reading from and writing matrix to stream
+ *
+ */
+void MatrixContentTest::ReadWriteTest()
+{
+  // set up matrix
+  for (int i=0;i<4;i++)
+    for (int j=0;j<3;j++)
+      m->set(i,j, i*3+j );
+
+  // write to stream
+  std::stringstream matrixstream;
+  m->write(matrixstream);
+
+  // parse in dimensions and check
+  std::pair<size_t, size_t> matrixdimensions = MatrixContent::preparseMatrixDimensions(matrixstream);
+  CPPUNIT_ASSERT_EQUAL( (size_t)4, matrixdimensions.first );
+  CPPUNIT_ASSERT_EQUAL( (size_t)3, matrixdimensions.second );
+  // parse in matrix and check
+  MatrixContent* n = new MatrixContent(4,3, matrixstream);
+  CPPUNIT_ASSERT_EQUAL( *m, *n );
+
+  // free matrix
+  delete n;
+}

src/LinearAlgebra/unittests/MatrixContentUnitTest.hpp

@@ -29 +29 @@
     CPPUNIT_TEST (ExchangeTest );
     CPPUNIT_TEST (PropertiesTest );
+    CPPUNIT_TEST (ReadWriteTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -40 +41 @@
     void ExchangeTest();
     void PropertiesTest();
+    void ReadWriteTest();
 
 private: