Changeset 557b39


Ignore:
Timestamp:
May 8, 2017, 1:51:00 PM (8 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes
Children:
23ad4f
Parents:
4a38b9
git-author:
Frederik Heber <heber@…> (04/05/17 19:02:36)
git-committer:
Frederik Heber <frederik.heber@…> (05/08/17 13:51:00)
Message:

boost::serialization changed text output format.

  • needed to write comparator program that first deserializes and then serializes both archives in order to compare onto common grounds.
  • TESTFIX: ParseFragmentResultContainer needed an extra purgeInstance() in its performUndo().
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • configure.ac

    r4a38b9 r557b39  
    2525
    2626dnl Check if we have enable python
    27 # python module
     27# python module-
    2828AC_MSG_CHECKING(whether to enable python module)
    2929AC_ARG_ENABLE(
    … …  
    565565AC_CONFIG_FILES([tests/regression/molecuilder], [chmod +x tests/regression/molecuilder])
    566566AC_CONFIG_FILES([tests/regression/adjacencymatcher], [chmod +x tests/regression/adjacencymatcher])
     567AC_CONFIG_FILES([tests/regression/difffragmentresultcontainer], [chmod +x tests/regression/difffragmentresultcontainer])
    567568AC_CONFIG_FILES([tests/regression/trianglematcher], [chmod +x tests/regression/trianglematcher])
    568569AC_CONFIG_FILES([tests/regression/runpython], [chmod +x tests/regression/runpython])

  • src/Actions/FragmentationAction/ParseFragmentResultsAction.cpp

    r4a38b9 r557b39  
    128128      assert_cast<FragmentationParseFragmentResultsState*>(_state.get());
    129129
     130  FragmentationResultContainer::purgeInstance();
    130131  FragmentationResultContainer& container = FragmentationResultContainer::getInstance();
    131132  std::stringstream contents(state->streamed_container);

  • tests/regression/Fragmentation/ParseSaveFragmentResults/testsuite-fragmentation-parse-save-fragment-results.at

    r4a38b9 r557b39  
    3131AT_CHECK([../../molecuilder --parse-fragment-results results.dat --save-fragment-results $file], 0, [ignore], [ignore])
    3232# we ignore white space changes (also missing new line on end of last line)
    33 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    34         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
    35                 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     33AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
     34        AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     35                AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
    3636        ])
    3737])
    … …  
    4141
    4242AT_CHECK([../../molecuilder --parse-fragment-results $file --save-fragment-results $newfile], 0, [ignore], [ignore])
    43 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    44         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
    45                 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     43AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
     44        AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     45                AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
    4646        ])
    4747])
    … …  
    5757AT_CHECK([../../molecuilder --parse-fragment-results results.dat --undo --save-fragment-results $emptyfile], 0, [ignore], [ignore])
    5858# we ignore white space changes (also missing new line on end of last line)
    59 AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_enabled.dat], 0, [ignore], [ignore], [
    60         AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_disabled.dat], 0, [ignore], [ignore], [
    61                 AT_CHECK([diff -Z $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     59AT_CHECK([../../difffragmentresultcontainer $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_enabled.dat], 0, [ignore], [ignore], [
     60        AT_CHECK([../../difffragmentresultcontainer $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_longrange_disabled.dat], 0, [ignore], [ignore], [
     61                AT_CHECK([../../difffragmentresultcontainer $emptyfile ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_empty_jobmarkt_disabled.dat], 0, [ignore], [ignore])
    6262        ])
    6363])
    … …  
    7373AT_CHECK([../../molecuilder --parse-fragment-results results.dat --undo --redo --save-fragment-results $file], 0, [ignore], [ignore])
    7474# we ignore white space changes (also missing new line on end of last line)
    75 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
    76         AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
    77                 AT_CHECK([diff -Z $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
     75AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_enabled.dat], 0, [ignore], [ignore], [
     76        AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_longrange_disabled.dat], 0, [ignore], [ignore], [
     77                AT_CHECK([../../difffragmentresultcontainer $file ${abs_top_srcdir}/tests/regression/Fragmentation/ParseSaveFragmentResults/post/results_jobmarkt_disabled.dat], 0, [ignore], [ignore])
    7878        ])
    7979])

  • tests/regression/Makefile.am

    r4a38b9 r557b39  
    2828
    2929DISTCLEANFILES = atconfig
     30
     31check_PROGRAMS = DiffFragmentResultContainer
     32noinst_PROGRAMS = DiffFragmentResultContainer
     33
     34DiffFragmentResultContainer_SOURCES = \
     35        DiffFragmentResultContainer.cpp
     36DiffFragmentResultContainer_CPPFLAGS = \
     37        -I$(top_srcdir)/src \
     38        -I$(top_srcdir)/ThirdParty/LinearAlgebra/src \
     39        ${BOOST_CPPFLAGS} \
     40        ${JobMarket_CFLAGS} \
     41        ${CodePatterns_CFLAGS}
     42DiffFragmentResultContainer_LDFLAGS = -ldl ${BOOST_LDFLAGS} ${CodePatterns_LDFLAGS} ${JobMarket_LDFLAGS}
     43DiffFragmentResultContainer_LDADD = \
     44        $(top_builddir)/src/libMolecuilder.la \
     45        $(top_builddir)/src/libMolecuilderFragmentationSummation.la \
     46        $(top_builddir)/src/libMolecuilderFragmentation_KeysetsContainer.la \
     47        $(top_builddir)/src/libMolecuilderHelpers.la \
     48        ${CodePatterns_LIBS} \
     49        $(BOOST_SERIALIZATION_LIBS) \
     50        $(BOOST_FILESYSTEM_LIBS) \
     51        $(BOOST_SYSTEM_LIBS)
    3052
    3153TESTSCRIPTS =
Note: See TracChangeset for help on using the changeset viewer.