Changeset 2a0eb0 for src/Actions/FragmentationAction

Timestamp:

Dec 3, 2012, 9:49:06 AM (12 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:

3501d2

Parents:

34e74fd

git-author:

Frederik Heber <heber@…> (09/19/12 09:47:16)

git-committer:

Frederik Heber <heber@…> (12/03/12 09:49:06)

Message:

FragmentationAction now works on selected atoms, split into molecules.

• i.e. we still call Fragmentation on a specific molecule but fragmentMolecule() receives a vector of ids to use in its AtomMask. This is however not yet implemented.
• TESTFIX: added --select-molecules-atoms to all fragmentation calls.

File:

• src/Actions/FragmentationAction/FragmentationAction.cpp (modified) (3 diffs)

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -44 +44 @@
 
 #include <iostream>
+#include <map>
 #include <string>
+#include <vector>
 
 #include "Actions/FragmentationAction/FragmentationAction.hpp"
@@ -56 +58 @@
 Action::state_ptr FragmentationFragmentationAction::performCall() {
   clock_t start,end;
-  molecule *mol = NULL;
-  int ExitFlag = 0;
+  int ExitFlag = -1;
+  World &world = World::getInstance();
 
+  // inform about used parameters
   LOG(0, "STATUS: Fragmenting molecular system with current connection matrix maximum bond distance "
       << params.distance.get() << " up to "
@@ -65 +68 @@
       << params.types.get() << "." << std::endl);
 
+  // check for selected atoms
+  if (world.beginAtomSelection() == world.endAtomSelection()) {
+    ELOG(1, "There are not atoms selected for fragmentation.");
+    return Action::failure;
+  }
+
+  // go through all atoms, note down their molecules and group them
+  typedef std::multimap<molecule *, atom *> clusters_t;
+  clusters_t clusters;
+  for (World::AtomSelectionConstIterator iter = world.beginAtomSelection();
+      iter != world.endAtomSelection(); ++iter) {
+    clusters.insert( std::make_pair(iter->second->getMolecule(), iter->second) );
+  }
+  LOG(1, "INFO: There are " << clusters.size()  << " molecules to consider.");
+
   DepthFirstSearchAnalysis DFS;
-  for (World::MoleculeSelectionConstIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
-    mol = iter->second;
-    ASSERT(mol != NULL, "No molecule has been picked for fragmentation.");
-    LOG(2, "INFO: Fragmenting molecule with bond distance " << params.distance.get() << " angstroem, order of " << params.order.get() << ".");
-    start = clock();
-    if (mol->hasBondStructure()) {
-      Fragmentation Fragmenter(mol, params.DoSaturation.get() ? DoSaturate : DontSaturate);
-      Fragmenter.setOutputTypes(params.types.get());
-      ExitFlag = Fragmenter.FragmentMolecule(params.order.get(), params.prefix.get(), DFS);
+  start = clock();
+  // go through all keys (i.e. all molecules)
+  clusters_t::const_iterator advanceiter;
+  for (clusters_t::const_iterator iter = clusters.begin();
+      iter != clusters.end();
+      iter = advanceiter) {
+    // get iterator to past last atom in this molecule
+    molecule * mol = iter->first;
+    advanceiter = clusters.upper_bound(mol);
+
+    // copy molecule's atoms' ids as parameters to Fragmentation's AtomMask
+    std::vector<atomId_t> mols_atomids;
+    std::transform(iter, advanceiter, std::back_inserter(mols_atomids),
+        boost::bind( &atom::getNr,
+            boost::bind( &clusters_t::value_type::second, _1 ))
+    );
+    LOG(2, "INFO: Fragmenting in molecule " << mol->getName() << " in " << clusters.count(mol) 
+        << " atoms, out of " << mol->getAtomCount() << ".");
+    Fragmentation Fragmenter(mol, params.DoSaturation.get() ? DoSaturate : DontSaturate);
+    Fragmenter.setOutputTypes(params.types.get());
+
+    // perform fragmentation
+    LOG(0, std::endl << " ========== Fragmentation of molecule " << mol->getName() << " ========================= ");
+    {
+      const int tempFlag = Fragmenter.FragmentMolecule(mols_atomids, params.order.get(), params.prefix.get(), DFS);
+      if ((ExitFlag == 2) && (tempFlag != 2))
+        ExitFlag = tempFlag; // if there is one molecule that needs further fragmentation, it overrides others
+      if (ExitFlag == -1)
+        ExitFlag = tempFlag; // if we are the first, we set the standard
     }
-    World::getInstance().setExitFlag(ExitFlag);
-    end = clock();
-    LOG(0, "STATUS: Clocks for this operation: " << (end-start) << ", time: " << ((double)(end-start)/CLOCKS_PER_SEC) << "s.");
   }
+  World::getInstance().setExitFlag(ExitFlag);
+  end = clock();
+  LOG(0, "STATUS: Clocks for this operation: " << (end-start) << ", time: " << ((double)(end-start)/CLOCKS_PER_SEC) << "s.");
+
   return Action::success;
 }