Changeset 41d023 for tests


Ignore:
Timestamp:
Oct 31, 2011, 11:16:17 AM (13 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:
e5ece4
Parents:
07a47e
git-author:
Frederik Heber <heber@…> (10/26/11 16:22:33)
git-committer:
Frederik Heber <heber@…> (10/31/11 11:16:17)
Message:

Renamed SetMpqcParametersAction to SetParserParametersAction and generalized.

  • now we may set the parameters of basically any parser, so far it's probably just mpqc and pis3.
  • changed operator<<(FormatParser_Parameters): no output when value is empty string.
  • changed operator>>(FormatParser_Parameters): Asserts were not really making sure that value_iter and param_iter were readible.
  • Added regression test on setting psi3 parameters (wfn).
Location:
tests/regression
Files:
2 added
2 edited
7 moved

Legend:

Unmodified
Added
Removed

  • tests/regression/Makefile.am

    r07a47e r41d023  
    9090        $(srcdir)/Parser/Mpqc/testsuite-parser-mpqc-load.at \
    9191        $(srcdir)/Parser/Mpqc/testsuite-parser-mpqc-save.at \
    92         $(srcdir)/Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters.at \
    93         $(srcdir)/Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-basis.at \
    94         $(srcdir)/Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-maxiterations.at \
    95         $(srcdir)/Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-theory.at \
    9692        $(srcdir)/Parser/Pcp/testsuite-parser-pcp-empty.at \
    9793        $(srcdir)/Parser/Pcp/testsuite-parser-pcp-load.at \
    … …  
    109105        $(srcdir)/Parser/Psi3/testsuite-parser-psi3-load.at \
    110106        $(srcdir)/Parser/Psi3/testsuite-parser-psi3-save.at \
     107        $(srcdir)/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc.at \
     108        $(srcdir)/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-basis.at \
     109        $(srcdir)/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-maxiterations.at \
     110        $(srcdir)/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-theory.at \
     111        $(srcdir)/Parser/SetParameters/Psi3/testsuite-parser-set-parameters-psi3-wavefunction.at \
    111112        $(srcdir)/Parser/Tremolo/testsuite-parser-tremolo-empty.at \
    112113        $(srcdir)/Parser/Tremolo/testsuite-parser-tremolo-load.at \

  • tests/regression/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-basis.at

    r07a47e r41d023  
    44AT_KEYWORDS([options mpqc set-mpqc-parameters basis])
    55
    6 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "basis = 4-31G"], 0, [stdout], [ignore])
     6AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G"], 0, [stdout], [ignore])
    77AT_CHECK([fgrep "name = \"4-31G\"" test.in], 0, [ignore], [ignore])
    88
    … …  
    1414AT_KEYWORDS([options mpqc set-mpqc-parameters basis undo])
    1515
    16 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "basis = 4-31G" --undo], 0, [stdout], [ignore])
     16AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G" --undo], 0, [stdout], [ignore])
    1717AT_CHECK([fgrep "name = \"4-31G\"" test.in], 0, [ignore], [ignore])
    1818
    … …  
    2323AT_KEYWORDS([options mpqc set-mpqc-parameters basis redo])
    2424
    25 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "basis = 4-31G" --undo --redo], 0, [stdout], [ignore])
     25AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G" --undo --redo], 0, [stdout], [ignore])
    2626AT_CHECK([fgrep "name = \"4-31G\"" test.in], 0, [ignore], [ignore])
    2727

  • tests/regression/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-maxiterations.at

    r07a47e r41d023  
    44AT_KEYWORDS([options mpqc set-mpqc-parameters maxiter])
    55
    6 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "maxiter = 499"], 0, [stdout], [ignore])
     6AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "maxiter = 499"], 0, [stdout], [ignore])
    77AT_CHECK([fgrep "maxiter = 499" test.in], 0, [ignore], [ignore])
    88
    … …  
    1414AT_KEYWORDS([options mpqc set-mpqc-parameters maxiter undo])
    1515
    16 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "maxiter = 499" --undo], 0, [stdout], [ignore])
     16AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "maxiter = 499" --undo], 0, [stdout], [ignore])
    1717AT_CHECK([fgrep "maxiter = 499" test.in], 0, [ignore], [ignore])
    1818
    … …  
    2323AT_KEYWORDS([options mpqc set-mpqc-parameters maxiter redo])
    2424
    25 AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "maxiter = 499" --undo --redo], 0, [stdout], [ignore])
     25AT_CHECK([../../molecuilder -i test.conf -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "maxiter = 499" --undo --redo], 0, [stdout], [ignore])
    2626AT_CHECK([fgrep "maxiter = 499" test.in], 0, [ignore], [ignore])
    2727

  • tests/regression/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-theory.at

    r07a47e r41d023  
    44AT_KEYWORDS([options mpqc set-mpqc-parameters theory])
    55
    6 AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "theory=CLKS"], 0, [stdout], [ignore])
     6AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "theory=CLKS"], 0, [stdout], [ignore])
    77AT_CHECK([fgrep "mole<CLKS>" test.in], 0, [ignore], [ignore])
    88
    … …  
    1313AT_KEYWORDS([options mpqc set-mpqc-parameters theory undo])
    1414
    15 AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "theory=CLKS" --undo], 0, [stdout], [ignore])
     15AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "theory=CLKS" --undo], 0, [stdout], [ignore])
    1616AT_CHECK([fgrep "reference<CLHF>" test.in], 0, [ignore], [ignore])
    1717AT_CHECK([fgrep "mole<MBPT2>" test.in], 0, [ignore], [ignore])
    … …  
    2323AT_KEYWORDS([options mpqc set-mpqc-parameters theory redo])
    2424
    25 AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/test.xyz -v 1 --set-mpqc-parameters "theory=CLKS" --undo --redo], 0, [stdout], [ignore])
     25AT_CHECK([../../molecuilder -i test.in -o mpqc -l ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/test.xyz -v 1 --set-parser-parameters "mpqc" --parser-parameters "theory=CLKS" --undo --redo], 0, [stdout], [ignore])
    2626AT_CHECK([fgrep "mole<CLKS>" test.in], 0, [ignore], [ignore])
    2727

  • tests/regression/Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc.at

    r07a47e r41d023  
    44AT_KEYWORDS([options mpqc set-mpqc-parameters basis maxiter theory])
    55
    6 AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/testCLHF.in -v 1 --set-mpqc-parameters "basis = 4-31G;maxiter=499;theory=CLKS;"], 0, [stdout], [ignore])
    7 AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/post/testCLHF.in], 0, [ignore], [ignore])
     6AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/testCLHF.in -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G;maxiter=499;theory=CLKS;"], 0, [stdout], [ignore])
     7AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/post/testCLHF.in], 0, [ignore], [ignore])
    88
    99AT_CLEANUP
    … …  
    1414AT_KEYWORDS([options mpqc set-mpqc-parameters basis maxiter theory undo])
    1515
    16 AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/testCLHF.in -v 1 --set-mpqc-parameters "basis = 4-31G;maxiter=499;theory=CLKS;" --undo], 0, [stdout], [ignore])
    17 AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/post/testCLHF.in], 0, [ignore], [ignore])
     16AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/testCLHF.in -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G;maxiter=499;theory=CLKS;" --undo], 0, [stdout], [ignore])
     17AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/post/testCLHF.in], 0, [ignore], [ignore])
    1818
    1919AT_CLEANUP
    … …  
    2323AT_KEYWORDS([options mpqc set-mpqc-parameters basis maxiter theory redo])
    2424
    25 AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/pre/testCLHF.in -v 1 --set-mpqc-parameters "basis = 4-31G;maxiter=499;theory=CLKS;" --undo --redo], 0, [stdout], [ignore])
    26 AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/Mpqc-SetParameters/post/testCLHF.in], 0, [ignore], [ignore])
     25AT_CHECK([../../molecuilder -i ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/pre/testCLHF.in -v 1 --set-parser-parameters "mpqc" --parser-parameters "basis = 4-31G;maxiter=499;theory=CLKS;" --undo --redo], 0, [stdout], [ignore])
     26AT_CHECK([file=testCLHF.in; diff -I '%.*' $file ${abs_top_srcdir}/tests/regression/Parser/SetParameters/Mpqc/post/testCLHF.in], 0, [ignore], [ignore])
    2727
    2828AT_CLEANUP

  • tests/regression/Parser/testsuite-parser.at

    r07a47e r41d023  
    11AT_BANNER([MoleCuilder - Parser])
    22
    3 # set MPQC basis, theory and maxiter
    4 m4_include([Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters.at])
    5 m4_include([Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-basis.at])
    6 m4_include([Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-maxiterations.at])
    7 m4_include([Parser/Mpqc-SetParameters/testsuite-parser-mpqc-set-parameters-theory.at])
    83
    94# parsing mpqc
    … …  
    116m4_include([Parser/Mpqc/testsuite-parser-mpqc-load.at])
    127m4_include([Parser/Mpqc/testsuite-parser-mpqc-save.at])
     8
     9# set mpqc basis, theory and maxiter
     10m4_include([Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc.at])
     11m4_include([Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-basis.at])
     12m4_include([Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-maxiterations.at])
     13m4_include([Parser/SetParameters/Mpqc/testsuite-parser-set-parameters-mpqc-theory.at])
    1314
    1415# parsing pcp
    … …  
    2425m4_include([Parser/Pdb/testsuite-parser-pdb-save.at])
    2526m4_include([Parser/Pdb/testsuite-parser-pdb-with-conects.at])
     27
     28# set psi3 wavefunction
     29m4_include([Parser/SetParameters/Psi3/testsuite-parser-set-parameters-psi3-wavefunction.at])
    2630
    2731# bugfix checks
Note: See TracChangeset for help on using the changeset viewer.