Changeset 50f418 for src

Timestamp:

May 17, 2012, 3:21:54 PM (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:

7ca772

Parents:

3a1346

git-author:

Frederik Heber <heber@…> (12/11/11 17:43:13)

git-committer:

Frederik Heber <heber@…> (05/17/12 15:21:54)

Message:

Removed all those tiny relay functions in FragmentController.

• we now use the getter/setters in the derived Operations directly.

Location:

src/Fragmentation/Automation/Controller

Files:

• FragmentController.hpp (modified) (1 diff)
• JobAdder.cpp (modified) (1 diff)
• ResultChecker.cpp (modified) (1 diff)
• ResultGetter.cpp (modified) (1 diff)

src/Fragmentation/Automation/Controller/FragmentController.hpp

@@ -68 +68 @@
   }
 
-  /// place number of jobs into this controller
-  void addJobs(const std::vector<FragmentJob> &jobs)
-  {
-    recjobs.addJobs(jobs);
-  }
-
-  /// get the results for the current jobs
-  std::vector<FragmentResult> getResults()
-  {
-    return sendres.getResults();
-  }
-
-  /// Getter for doneJobs
-  size_t getDoneJobs() const
-  {
-    return checkres.getDoneJobs();
-  }
-
-  /// Getter for number of jobs in the queue
-  size_t getPresentJobs() const
-  {
-    return recjobs.getPresentJobs();
-  }
-
-private:
-  /// host name of server
-  const std::string host;
-
-  // service to connect to to
-  const std::string service;
 };
 

src/Fragmentation/Automation/Controller/JobAdder.cpp

@@ -66 +66 @@
       jobs.push_back(testJob);
     }
-    controller.addJobs(jobs);
+    controller.recjobs.addJobs(jobs);
     controller.recjobs(argv[1], argv[2]);
     {

src/Fragmentation/Automation/Controller/ResultChecker.cpp

@@ -64 +64 @@
       io_service.run();
     }
-    size_t doneJobs = controller.getDoneJobs();
+    size_t doneJobs = controller.checkres.getDoneJobs();
     LOG(1, "INFO: " << doneJobs << " jobs are calculated so far.");
     Exitflag = controller.getExitflag();

src/Fragmentation/Automation/Controller/ResultGetter.cpp

@@ -72 +72 @@
       io_service.run();
     }
-    std::vector<FragmentResult> results = controller.getResults();
+    std::vector<FragmentResult> results = controller.sendres.getResults();
     for (std::vector<FragmentResult>::const_iterator iter = results.begin();
         iter != results.end(); ++iter)