Changeset 1ab6fc for tests

Timestamp:

May 18, 2016, 10:02:54 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, 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_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, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, 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:

843590

Parents:

f33ef9

git-author:

Frederik Heber <heber@…> (03/10/16 13:25:57)

git-committer:

Frederik Heber <heber@…> (05/18/16 22:02:54)

Message:

TESTFIX: regression test fit-partial-charges requires atomfragments file.

Location:

tests/regression/Potential/FitPartialCharges

Files:

• post/water.particles (modified) (1 diff)
• pre/atomfragments.dat (added)
• testsuite-potential-fit-partial-charges.at (modified) (1 diff)

tests/regression/Potential/FitPartialCharges/post/water.particles

@@ -1 +1 @@
         particle:       particle_type=H1,       element_name=H, sigma=0,        epsilon=0,      sigma14=0,      epsilon14=0,    mass=0, free=3, charge=0.3682424148;
-        particle:       particle_type=H2,       element_name=H, sigma=0,        epsilon=0,      sigma14=0,      epsilon14=0,    mass=0, free=3, charge=0.368536001;
         particle:       particle_type=O1,       element_name=O, sigma=0,        epsilon=0,      sigma14=0,      epsilon14=0,    mass=0, free=3, charge=-0.7367784158;

tests/regression/Potential/FitPartialCharges/testsuite-potential-fit-partial-charges.at

@@ -18 +18 @@
 ### fit partial particle charges
 
-# the potential has been generated by:
-# ./molecuilder -i pre/water.pdb --center-in-box "8,0,8,0,0,8" --select-all-atoms --fragment-molecule BondFragment --distance 2 --order 1 --fragment-automation --server-address 127.0.0.1 --server-port 1026 --DoLongrange 1 --grid 4 --DoPrintDebug 1 --DoValenceOnly 0 --analyse-fragment-results --store-grids 1 --save-homologies homology_grid_4_full.dat
+AT_SETUP([Potential - Fit partial charges - atomfragment check])
+AT_KEYWORDS([potential parse-homologies fit-partial-charges save-particle-parameters])
+AT_SKIP_IF([../../molecuilder --help fit-partial-charges; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+
+input=water.pdb
+homologyfile=homology_grid.dat
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$input $input], 0)
+AT_CHECK([chmod u+w $input], 0, [ignore], [ignore])
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$homologyfile $homologyfile], 0)
+AT_CHECK([chmod u+w $homologyfile], 0, [ignore], [ignore])
+# fails because atomFragments has not been parsed
+AT_CHECK([../../molecuilder -l $input --select-all-atoms --parse-homologies $homologyfile --fit-partial-charges --radius 1.5 --save-particle-parameters water.particles], 5, [stdout], [ignore])
+
+AT_CLEANUP
 
 AT_SETUP([Potential - Fit partial charges to water])
 AT_KEYWORDS([potential parse-homologies fit-partial-charges save-particle-parameters])
 AT_SKIP_IF([../../molecuilder --help fit-partial-charges; if test $? -eq 5; then /bin/true; else /bin/false; fi])
-AT_XFAIL_IF([/bin/true])
 
 # homology file created with water.pdb and as follows:
-# molecuilder -i water.pdb --select-all-atoms --fragment-molecule --distance 2 --order 1 --fragment-automation --server-address 127.0.0.1 --server-port 1026 --DoLongrange 1 --grid 5 --store-grids 1 --analyse-fragment-results --save-homologies homology_grid.dat
-file=homology_grid.dat
-AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$file $file], 0)
-AT_CHECK([chmod u+w $file], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder --parse-homologies $file --fit-partial-charges --fragment-charges 8 1 1 --radius 1.5 --save-particle-parameters water.particles], 0, [stdout], [ignore])
+# molecuilder -i water.pdb --select-all-atoms --fragment-molecule --distance 2 --order 1 --fragment-automation --server-address 127.0.0.1 --server-port 1026 --DoLongrange 1 --grid 5 --store-grids 1 --analyse-fragment-results --save-homologies homology_grid.dat --save-atom-fragments atomfragments.dat
+input=water.pdb
+homologyfile=homology_grid.dat
+atomfragmentsfile=atomfragments.dat
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$input $input], 0)
+AT_CHECK([chmod u+w $input], 0, [ignore], [ignore])
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$homologyfile $homologyfile], 0)
+AT_CHECK([chmod u+w $homologyfile], 0, [ignore], [ignore])
+AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/pre/$atomfragmentsfile $atomfragmentsfile], 0)
+AT_CHECK([chmod u+w $atomfragmentsfile], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilder -l $input --select-all-atoms --parse-homologies $homologyfile --parse-atom-fragments $atomfragmentsfile --fit-partial-charges --radius 1.5 --save-particle-parameters water.particles], 0, [stdout], [ignore])
 # check that L_2 error is below 1e-6
 AT_CHECK([grep "L2-Norm" stdout | awk '{if ($6 > 1e1) exit 1}'], 0, [ignore], [ignore])
 AT_CHECK([grep "L1-Norm" stdout | awk '{if ($6 > 1e0) exit 1}'], 0, [ignore], [ignore])
-AT_CHECK([grep "We have fitted the following charges ( -0.73.*; 0.36.*; 0.36.*; )." stdout], 0, [ignore], [ignore])
+AT_CHECK([grep "Adding particle O1.*-0.73" stdout], 0, [ignore], [ignore])
+AT_CHECK([grep "Adding particle H1.*0.36" stdout], 0, [ignore], [ignore])
+AT_CHECK([grep "atom O1.*received .*O1" stdout], 0, [ignore], [ignore])
+AT_CHECK([grep "atom H2.*received .*H1" stdout], 0, [ignore], [ignore])
+AT_CHECK([grep "atom H3.*received .*H1" stdout], 0, [ignore], [ignore])
 AT_CHECK([diff water.particles ${abs_top_srcdir}/tests/regression/Potential/FitPartialCharges/post/water.particles], 0)