Changeset 730d7a

Timestamp:

Oct 25, 2011, 12:08:03 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:

851be8

Parents:

75363b

git-author:

Frederik Heber <heber@…> (10/20/11 10:34:17)

git-committer:

Frederik Heber <heber@…> (10/25/11 12:08:03)

Message:

New class AdaptivityMap and moved some functions from fragmentation_helpers into it.

Location:

src/Fragmentation

Files:

• AdaptivityMap.cpp (added)
• AdaptivityMap.hpp (added)
• Fragmentation.cpp (modified) (3 diffs)
• Graph.cpp (modified) (2 diffs)
• Graph.hpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• fragmentation_helpers.cpp (modified) (2 diffs)
• fragmentation_helpers.hpp (modified) (2 diffs)

src/Fragmentation/Fragmentation.cpp

@@ -28 +28 @@
 #include "Element/element.hpp"
 #include "Element/periodentafel.hpp"
+#include "Fragmentation/AdaptivityMap.hpp"
 #include "Fragmentation/fragmentation_helpers.hpp"
 #include "Fragmentation/Graph.hpp"
@@ -464 +465 @@
       return false;
     }
-    map<int,KeySet> *IndexKeySetList = GlobalKeySetList->GraphToIndexedKeySet();
+    AdaptivityMap * IndexKeySetList = GlobalKeySetList->GraphToAdaptivityMap();
 
     // parse the EnergyPerFragment file
-    map<int, pair<double,int> > *AdaptiveCriteriaList = ScanAdaptiveFileIntoMap(path, *IndexKeySetList); // (Root No., (Value, Order)) !
+    std::map<int, std::pair<double,int> > *AdaptiveCriteriaList = IndexKeySetList->ScanAdaptiveFileIntoMap(path); // (Root No., (Value, Order)) !
     if (AdaptiveCriteriaList->empty()) {
       DoeLog(2) && (eLog()<< Verbose(2) << "Unable to parse file, incrementing all." << endl);
@@ -481 +482 @@
     }
     // then map back onto (Value, (Root Nr., Order)) (i.e. sorted by value to pick the highest ones)
-    map<double, pair<int,int> > *FinalRootCandidates = ReMapAdaptiveCriteriaListToValue(AdaptiveCriteriaList, mol);
+    std::map<double, std::pair<int,int> > *FinalRootCandidates = IndexKeySetList->ReMapAdaptiveCriteriaListToValue(AdaptiveCriteriaList, mol);
 
     // pick the ones still below threshold and mark as to be adaptively updated

src/Fragmentation/Graph.cpp

@@ -29 +29 @@
 #include "CodePatterns/Log.hpp"
 
+#include "Fragmentation/AdaptivityMap.hpp"
 #include "Helpers/defs.hpp"
 #include "Helpers/helpers.hpp"
@@ -223 +224 @@
  * \return ref to allocated map from index to keyset
  */
-std::map<int,KeySet> * Graph::GraphToIndexedKeySet() const
-{
-  map<int,KeySet> *IndexKeySetList = new map<int,KeySet>;
+AdaptivityMap * Graph::GraphToAdaptivityMap() const
+{
+  AdaptivityMap *IndexKeySetList = new AdaptivityMap;
   for(const_iterator runner = begin(); runner != end(); runner++) {
     IndexKeySetList->insert( pair<int,KeySet>(runner->second.first,runner->first) );

src/Fragmentation/Graph.hpp

@@ -22 +22 @@
 typedef std::pair<KeySet, NumberValuePair> GraphPair;
 
+class AdaptivityMap;
+
 class Graph : public std::map <KeySet, NumberValuePair >
 {
@@ -35 +37 @@
   bool StoreTEFactorsFile(char *path);
 
-  std::map<int,KeySet> * GraphToIndexedKeySet() const;
+  AdaptivityMap * GraphToAdaptivityMap() const;
 };
 

src/Fragmentation/Makefile.am

@@ -3 +3 @@
 
 FRAGMENTATIONSOURCE = \
+        Fragmentation/AdaptivityMap.cpp \
         Fragmentation/BondsPerShortestPath.cpp \
         Fragmentation/EnergyMatrix.cpp \
@@ -18 +19 @@
 
 FRAGMENTATIONHEADER = \
+        Fragmentation/AdaptivityMap.hpp \
         Fragmentation/BondsPerShortestPath.hpp \
         Fragmentation/defs.hpp \

src/Fragmentation/fragmentation_helpers.cpp

@@ -29 +29 @@
 #include "Bond/bond.hpp"
 #include "Element/element.hpp"
+#include "Fragmentation/AdaptivityMap.hpp"
 #include "Fragmentation/Graph.hpp"
 #include "Fragmentation/KeySet.hpp"
@@ -37 +38 @@
 using namespace std;
 
-/** Inserts a (\a No, \a value) pair into the list, overwriting present one.
- * Note if values are equal, No will decided on which is first
- * \param *out output stream for debugging
- * \param &AdaptiveCriteriaList list to insert into
- * \param &IndexedKeySetList list to find key set for a given index \a No
- * \param FragOrder current bond order of fragment
- * \param No index of keyset
- * \param value energy value
- */
-void InsertIntoAdaptiveCriteriaList(std::map<int, pair<double,int> > *AdaptiveCriteriaList, std::map<int,KeySet> &IndexKeySetList, int FragOrder, int No, double Value)
-{
-  map<int,KeySet>::iterator marker = IndexKeySetList.find(No);    // find keyset to Frag No.
-  if (marker != IndexKeySetList.end()) {  // if found
-    Value *= 1 + MYEPSILON*(*((*marker).second.begin()));     // in case of equal energies this makes them not equal without changing anything actually
-    // as the smallest number in each set has always been the root (we use global id to keep the doubles away), seek smallest and insert into AtomMask
-    pair <map<int, pair<double,int> >::iterator, bool> InsertedElement = AdaptiveCriteriaList->insert( make_pair(*((*marker).second.begin()), pair<double,int>( fabs(Value), FragOrder) ));
-    map<int, pair<double,int> >::iterator PresentItem = InsertedElement.first;
-    if (!InsertedElement.second) { // this root is already present
-      if ((*PresentItem).second.second < FragOrder)  // if order there is lower, update entry with higher-order term
-        //if ((*PresentItem).second.first < (*runner).first)    // as higher-order terms are not always better, we skip this part (which would always include this site into adaptive increase)
-        {  // if value is smaller, update value and order
-        (*PresentItem).second.first = fabs(Value);
-        (*PresentItem).second.second = FragOrder;
-        DoLog(2) && (Log() << Verbose(2) << "Updated element (" <<  (*PresentItem).first << ",[" << (*PresentItem).second.first << "," << (*PresentItem).second.second << "])." << endl);
-      } else {
-        DoLog(2) && (Log() << Verbose(2) << "Did not update element " <<  (*PresentItem).first << " as " << FragOrder << " is less than or equal to " << (*PresentItem).second.second << "." << endl);
-      }
-    } else {
-      DoLog(2) && (Log() << Verbose(2) << "Inserted element (" <<  (*PresentItem).first << ",[" << (*PresentItem).second.first << "," << (*PresentItem).second.second << "])." << endl);
-    }
-  } else {
-    DoLog(1) && (Log() << Verbose(1) << "No Fragment under No. " << No << "found." << endl);
-  }
-};
-
-/** Counts lines in file.
- * Note we are scanning lines from current position, not from beginning.
- * \param InputFile file to be scanned.
- */
-int CountLinesinFile(std::ifstream &InputFile)
-{
-  char *buffer = new char[MAXSTRINGSIZE];
-  int lines=0;
-
-  int PositionMarker = InputFile.tellg();  // not needed as Inputfile is copied, given by value, not by ref
-  // count the number of lines, i.e. the number of fragments
-  InputFile.getline(buffer, MAXSTRINGSIZE); // skip comment lines
-  InputFile.getline(buffer, MAXSTRINGSIZE);
-  while(!InputFile.eof()) {
-    InputFile.getline(buffer, MAXSTRINGSIZE);
-    lines++;
-  }
-  InputFile.seekg(PositionMarker, ios::beg);
-  delete[](buffer);
-  return lines;
-};
 
 
-/** Scans the adaptive order file and insert (index, value) into map.
- * \param &path path to ENERGYPERFRAGMENT file (may be NULL if Order is non-negative)
- * \param &IndexedKeySetList list to find key set for a given index \a No
- * \return adaptive criteria list from file
- */
-std::map<int, std::pair<double,int> > * ScanAdaptiveFileIntoMap(std::string &path, std::map<int,KeySet> &IndexKeySetList)
-{
-  map<int, pair<double,int> > *AdaptiveCriteriaList = new map<int, pair<double,int> >;
-  int No = 0, FragOrder = 0;
-  double Value = 0.;
-  char buffer[MAXSTRINGSIZE];
-  string filename = path + ENERGYPERFRAGMENT;
-  ifstream InputFile(filename.c_str());
-
-  if (InputFile.fail()) {
-    DoeLog(1) && (eLog() << Verbose(1) << "Cannot find file " << filename << "." << endl);
-    return AdaptiveCriteriaList;
-  }
-
-  if (CountLinesinFile(InputFile) > 0) {
-    // each line represents a fragment root (Atom::Nr) id and its energy contribution
-    InputFile.getline(buffer, MAXSTRINGSIZE); // skip comment lines
-    InputFile.getline(buffer, MAXSTRINGSIZE);
-    while(!InputFile.eof()) {
-      InputFile.getline(buffer, MAXSTRINGSIZE);
-      if (strlen(buffer) > 2) {
-        //Log() << Verbose(2) << "Scanning: " << buffer << endl;
-        stringstream line(buffer);
-        line >> FragOrder;
-        line >> ws >> No;
-        line >> ws >> Value; // skip time entry
-        line >> ws >> Value;
-        No -= 1;  // indices start at 1 in file, not 0
-        //Log() << Verbose(2) << " - yields (" << No << "," << Value << ", " << FragOrder << ")" << endl;
-
-        // clean the list of those entries that have been superceded by higher order terms already
-        InsertIntoAdaptiveCriteriaList(AdaptiveCriteriaList, IndexKeySetList, FragOrder, No, Value);
-      }
-    }
-    // close and done
-    InputFile.close();
-    InputFile.clear();
-  }
-
-  return AdaptiveCriteriaList;
-};
-
-/** Maps adaptive criteria list back onto (Value, (Root Nr., Order))
- * (i.e. sorted by value to pick the highest ones)
- * \param *out output stream for debugging
- * \param &AdaptiveCriteriaList list to insert into
- * \param *mol molecule with atoms
- * \return remapped list
- */
-std::map<double, std::pair<int,int> >  * ReMapAdaptiveCriteriaListToValue(std::map<int, std::pair<double,int> > *AdaptiveCriteriaList, molecule *mol)
-{
-  atom *Walker = NULL;
-  map<double, pair<int,int> > *FinalRootCandidates = new map<double, pair<int,int> > ;
-  DoLog(1) && (Log() << Verbose(1) << "Root candidate list is: " << endl);
-  for(map<int, pair<double,int> >::iterator runner = AdaptiveCriteriaList->begin(); runner != AdaptiveCriteriaList->end(); runner++) {
-    Walker = mol->FindAtom((*runner).first);
-    if (Walker != NULL) {
-      //if ((*runner).second.second >= Walker->AdaptiveOrder) { // only insert if this is an "active" root site for the current order
-      if (!Walker->MaxOrder) {
-        DoLog(2) && (Log() << Verbose(2) << "(" << (*runner).first << ",[" << (*runner).second.first << "," << (*runner).second.second << "])" << endl);
-        FinalRootCandidates->insert( make_pair( (*runner).second.first, pair<int,int>((*runner).first, (*runner).second.second) ) );
-      } else {
-        DoLog(2) && (Log() << Verbose(2) << "Excluding (" << *Walker << ", " << (*runner).first << ",[" << (*runner).second.first << "," << (*runner).second.second << "]), as it has reached its maximum order." << endl);
-      }
-    } else {
-      DoeLog(0) && (eLog()<< Verbose(0) << "Atom No. " << (*runner).second.first << " was not found in this molecule." << endl);
-      performCriticalExit();
-    }
-  }
-  return FinalRootCandidates;
-};
 
 /** Marks all candidate sites for update if below adaptive threshold.

src/Fragmentation/fragmentation_helpers.hpp

@@ -22 +22 @@
 typedef std::deque<int> KeyStack;
 
+class AdaptivityMap;
 class bond;
 class Graph;
@@ -27 +28 @@
 class molecule;
 
-void InsertIntoAdaptiveCriteriaList(std::map<int, std::pair<double,int> > *AdaptiveCriteriaList, std::map<int,KeySet> &IndexKeySetList, int FragOrder, int No, double Value);
-int CountLinesinFile(std::ifstream &InputFile);
-std::map<int, std::pair<double,int> > * ScanAdaptiveFileIntoMap(std::string &path, std::map<int,KeySet> &IndexKeySetList);
-std::map<double, std::pair<int,int> >  * ReMapAdaptiveCriteriaListToValue(std::map<int, std::pair<double,int> > *AdaptiveCriteriaList, molecule *mol);
 bool MarkUpdateCandidates(bool *AtomMask, std::map<double, std::pair<int,int> > &FinalRootCandidates, int Order, molecule *mol);
 void PrintAtomMask(bool *AtomMask, int AtomCount);