Changeset 08d042

Timestamp:

Jun 11, 2015, 11:21:41 PM (10 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:

3fa16b

Parents:

37a67f

git-author:

Frederik Heber <heber@…> (05/17/15 07:34:31)

git-committer:

Frederik Heber <heber@…> (06/11/15 23:21:41)

Message:

Added "--testsingle" switch for line-by-line execution.

• QTUIFactory checks for additional "single" and activates then a special mode which uses the newly split executePythonScript.

Location:

src/UIElements/Qt4

Files:

• QtUIFactory.cpp (modified) (4 diffs)
• QtUIFactory.hpp (modified) (1 diff)

src/UIElements/Qt4/QtUIFactory.cpp

@@ -35 +35 @@
 #include <cassert>
 #include <iostream>
+#include <fstream>
 #include <string.h>
 
@@ -72 +73 @@
       scripts.push_back(std::string(_argv[i]));
 
+    // check for line-by-line execution
+    const bool SingleLineStepping = (strncmp(&_argv[1][6], "single", 6) == 0);
+
     // prepare an extra thread
     std::cout << "TESTLAUNCHER: Preparing " << std::endl;
     testlauncher_thread = new boost::thread(
-        boost::bind(&QtUIFactory::testrun, this, scripts));
+        boost::bind(&QtUIFactory::testrun, this, scripts, SingleLineStepping));
 #else
     std::cerr << "Boost::thread support missing! Cannot launch test scripts.\n";
@@ -130 +134 @@
 }
 
-void QtUIFactory::testrun(const std::vector<std::string> _scripts) const
+void QtUIFactory::testrun(const std::vector<std::string> _scripts, const bool _singleLineStepping) const
 {
   std::cout << "TESTLAUNCHER: Waiting for GUI to set up" << std::endl;
@@ -138 +142 @@
   do {
     // then launch script
-    std::cout << "TESTLAUNCHER: Launching script " << *scriptiter << std::endl;
-    boost::filesystem::path scriptfilename(*scriptiter);
-    ASSERT( boost::filesystem::exists(scriptfilename),
-        "QtUIFactory::testrun() - given testmode script file "
-        +toString(scriptfilename.string())+" does not exist.");
-    executePythonScriptFile(scriptfilename);
+    std::cout << "TESTLAUNCHER: Launching script " << *scriptiter
+        << (_singleLineStepping ? " line by line." : ".") <<std::endl;
+    if (_singleLineStepping) {
+      boost::filesystem::path scriptfilename(*scriptiter);
+      ASSERT( boost::filesystem::exists(scriptfilename),
+          "QtUIFactory::testrun() - given testmode script file "
+          +toString(scriptfilename.string())+" does not exist.");
+      std::ifstream scriptfile(scriptfilename.string().c_str());
+      std::string scriptfile_line;
+      const std::string testmode("testmode, line nr.");
+      unsigned int line_nr = 0;
+      while(std::getline(scriptfile, scriptfile_line)) {
+        std::string scriptname = testmode+toString(++line_nr);
+        executePythonScript(scriptfile_line, scriptname);
+      }
+    } else {
+      executePythonScriptFile(*scriptiter);
+    }
     ++scriptiter;
 

src/UIElements/Qt4/QtUIFactory.hpp

@@ -52 +52 @@
 private:
 
-  void testrun(const std::vector<std::string> _scripts) const;
+  void testrun(const std::vector<std::string> _scripts, const bool _singleLineStepping = false) const;
 
   void testlauncher_sleep(const boost::posix_time::time_duration& _period) const;