Changeset a91710 for src/Actions

Timestamp:

Aug 21, 2014, 6:59:33 AM (11 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:

29b35e

Parents:

4c9101 (diff), 0c72e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Fixes_Ubuntu14_04' into stable

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (1 diff)
• Action_impl_python.hpp (modified) (5 diffs)
• FragmentationAction/FragmentationAutomationAction.cpp (modified) (1 diff)
• unittests/Makefile.am (modified) (4 diffs)

src/Actions/ActionQueue.cpp

@@ -145 +145 @@
       run_thread.sleep(boost::get_system_time() + boost::posix_time::milliseconds(100));
 #else
-      run_thread.sleep_for(100);
+      boost::this_thread::sleep_for(boost::chrono::milliseconds(100));
 #endif
     } catch(boost::thread_interrupted &e) {

src/Actions/Action_impl_python.hpp

@@ -21 +21 @@
 #include <boost/preprocessor/punctuation/comma_if.hpp>
 #include <boost/preprocessor/punctuation/paren.hpp>
+#include <boost/preprocessor/seq/elem.hpp>
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/seq/transform.hpp>
 
 // some derived names: if CATEGORY is not given, we don't prefix with it
@@ -48 +51 @@
 BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramdescriptions)),\
   ERROR: There are not the same number of "paramtokens" and "paramdescriptions" in: __FILE__ \
+)
+#endif
+#ifdef paramreferences
+BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramreferences)),\
+  ERROR: There are not the same number of "paramtokens" and "paramreferences" in: __FILE__ \
+)
+#endif
+
+#ifdef paramtypes
+BOOST_PP_ASSERT_MSG(BOOST_PP_EQUAL(MAXPARAMTYPES, BOOST_PP_SEQ_SIZE(paramtypes)),\
+  ERROR: There are not the same number of "paramtokens" and "paramtypes" in: __FILE__ \
 )
 #endif
@@ -83 +97 @@
 // print a list of type ref followed, i.e. "int i, double position"
 #define type_list(z,n,TYPELIST, VARLIST) \
-  BOOST_PP_COMMA_IF(n)\
+  BOOST_PP_COMMA_IF(n) \
   BOOST_PP_SEQ_ELEM(n, TYPELIST) \
   BOOST_PP_SEQ_ELEM(n, VARLIST)
@@ -90 +104 @@
 #define value_print(z, n, container, prefix) \
   prefix \
-  BOOST_PP_SEQ_ELEM(n, container)\
-  .set(\
-  BOOST_PP_SEQ_ELEM(n, container)\
+  BOOST_PP_SEQ_ELEM(n, container) \
+  .set( \
+  BOOST_PP_SEQ_ELEM(n, container) \
   );
 
@@ -110 +124 @@
 BOOST_PP_CAT( COMMAND, _stringargs)(
 #if defined paramtypes
-#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, , paramtypes), paramreferences)
+#define BOOST_PP_LOCAL_MACRO(n) type_list(~, n, BOOST_PP_SEQ_TRANSFORM( type2string, ~, paramtypes), paramreferences)
 #define BOOST_PP_LOCAL_LIMITS  (0, MAXPARAMTYPES-1)
 #include BOOST_PP_LOCAL_ITERATE()

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -175 +175 @@
         params.executable.get().string()
         );
+    if (NoJobs != NumberJobs) {
+      ELOG(1, "Not all jobs were added succesfully.");
+      return Action::failure;
+    }
     LOG(1, "INFO: Added " << NoJobs << " from FragmentJobsQueue.");
 

src/Actions/unittests/Makefile.am

@@ -25 +25 @@
 
 ACTIONLIBS = \
+        libUnitTest.la \
+        ../libMolecuilder.la \
         ../libMolecuilderUI.la
 if CONDJOBMARKET
@@ -33 +35 @@
 # note that DummyUI inherits Dialog which depends on boost/file_system ...
 
-ActionRegistryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ActionRegistryUnitTest_SOURCES = \
         ../Actions/unittests/ActionRegistryUnitTest.cpp \
         ../Actions/unittests/ActionRegistryUnitTest.hpp \
@@ -40 +42 @@
         ../Parameters/unittests/stubs/BoxVectorValidatorStub.cpp \
         ../Parameters/unittests/stubs/TimeStepPresentValidatorStub.cpp
-ActionRegistryUnitTest_LDADD = ${ACTIONLIBS}
+ActionRegistryUnitTest_LDADD = ${ACTIONLIBS} \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
-ActionSequenceUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ActionSequenceUnitTest_SOURCES = \
         ../Actions/unittests/ActionSequenceUnitTest.cpp \
         ../Actions/unittests/ActionSequenceUnitTest.hpp \
@@ -55 +58 @@
         $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
-AtomsCalculationUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+AtomsCalculationUnitTest_SOURCES = \
         ../Actions/unittests/AtomsCalculationUnitTest.cpp \
         ../Actions/unittests/AtomsCalculationUnitTest.hpp
 AtomsCalculationUnitTest_LDADD = ${ACTIONLIBS}
 
-ManipulateAtomsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+ManipulateAtomsUnitTest_SOURCES = \
         ../Actions/unittests/ManipulateAtomsUnitTest.cpp \
         ../Actions/unittests/ManipulateAtomsUnitTest.hpp \