Changeset 73916f for src/unittests/ParserTremoloUnitTest.cpp

Timestamp:

Dec 16, 2010, 5:32:22 PM (14 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:

fc5c3a

Parents:

512f85

git-author:

Frederik Heber <heber@…> (12/11/10 15:57:00)

git-committer:

Frederik Heber <heber@…> (12/16/10 17:32:22)

Message:

Extended FormatParser::save() to use vector<atom *> to save.

• This is needed to make the save functions also work on selected atoms or molecules only.
• Within ParserCommonUnitTest, ParserTremoloUnitTest we create the vector by calling World's getAllAtoms() (which would have been done before in the specialized save() functions).
• new functions in FormatParserStorage:
  • saveSelectedAtoms().
  • saveSelectedMolecules().
  • saveWorld().
• renamed ::get() and ::put() to ::load() and ::save() to have it more consistent with underlying FormatParser functions and also to avoid misinterpretation with all ::get...() functions.

File:

• src/unittests/ParserTremoloUnitTest.cpp (modified) (4 diffs)

src/unittests/ParserTremoloUnitTest.cpp

@@ -74 +74 @@
 
   // Atomdata beginning with "# ATOMDATA"
-  input << Tremolo_Atomdata1;
-  testParser->load(&input);
-  testParser->save(&output);
-  CPPUNIT_ASSERT(Tremolo_Atomdata1 == output.str());
-  input.clear();
-  output.clear();
+  {
+    input << Tremolo_Atomdata1;
+    testParser->load(&input);
+    std::vector<atom *> atoms = World::getInstance().getAllAtoms();
+    testParser->save(&output, atoms);
+    CPPUNIT_ASSERT(Tremolo_Atomdata1 == output.str());
+    input.clear();
+    output.clear();
+  }
 
   // Atomdata beginning with "#ATOMDATA"
-  input << Tremolo_Atomdata2;
-  testParser->load(&input);
-  testParser->save(&output);
-  CPPUNIT_ASSERT(output.str().find("hydrogen") != string::npos);
-  input.clear();
-  output.clear();
+  {
+    input << Tremolo_Atomdata2;
+    testParser->load(&input);
+    std::vector<atom *> atoms = World::getInstance().getAllAtoms();
+    testParser->save(&output, atoms);
+    CPPUNIT_ASSERT(output.str().find("hydrogen") != string::npos);
+    input.clear();
+    output.clear();
+  }
 
   // Invalid key in Atomdata line
   input << Tremolo_invalidkey;
   testParser->load(&input);
-  //TODO: proove invalidity
+  //TODO: prove invalidity
   input.clear();
 }
@@ -137 +143 @@
 
   // Neighbor data
-  input << Tremolo_improper;
-  testParser->load(&input);
-  testParser->save(&output);
-  CPPUNIT_ASSERT_EQUAL(3, World::getInstance().numAtoms());
-  CPPUNIT_ASSERT(output.str().find("2-0,0-2") != string::npos);
-  input.clear();
-  output.clear();
+  {
+    input << Tremolo_improper;
+    testParser->load(&input);
+    std::vector<atom *> atoms = World::getInstance().getAllAtoms();
+    testParser->save(&output, atoms);
+    CPPUNIT_ASSERT_EQUAL(3, World::getInstance().numAtoms());
+    CPPUNIT_ASSERT(output.str().find("2-0,0-2") != string::npos);
+    input.clear();
+    output.clear();
+  }
 }
 
@@ -151 +160 @@
 
   // Neighbor data
-  input << Tremolo_torsion;
-  testParser->load(&input);
-  testParser->save(&output);
-  CPPUNIT_ASSERT_EQUAL(3, World::getInstance().numAtoms());
-  CPPUNIT_ASSERT(output.str().find("2-0,0-2") != string::npos);
-  input.clear();
-  output.clear();
+  {
+    input << Tremolo_torsion;
+    testParser->load(&input);
+    std::vector<atom *> atoms = World::getInstance().getAllAtoms();
+    testParser->save(&output, atoms);
+    CPPUNIT_ASSERT_EQUAL(3, World::getInstance().numAtoms());
+    CPPUNIT_ASSERT(output.str().find("2-0,0-2") != string::npos);
+    input.clear();
+    output.clear();
+  }
 }
 
@@ -165 +177 @@
 
   // with the maximum number of fields and minimal information, default values are printed
-  atom* newAtom = World::getInstance().createAtom();
-  newAtom->setType(1);
-  testParser->setFieldsForSave("x=3 u=3 F stress Id neighbors=5 imprData GroupMeasureTypeNo Type extType name resName chainID resSeq occupancy tempFactor segID Charge charge GrpTypeNo torsion");
-  testParser->save(&output);
-  CPPUNIT_ASSERT(output.str() == Tremolo_full);
+  {
+    atom* newAtom = World::getInstance().createAtom();
+    newAtom->setType(1);
+    testParser->setFieldsForSave("x=3 u=3 F stress Id neighbors=5 imprData GroupMeasureTypeNo Type extType name resName chainID resSeq occupancy tempFactor segID Charge charge GrpTypeNo torsion");
+    std::vector<atom *> atoms = World::getInstance().getAllAtoms();
+    testParser->save(&output, atoms);
+    CPPUNIT_ASSERT(output.str() == Tremolo_full);
+  }
 
   cout << "testing the tremolo parser is done" << endl;