Changeset ec9bd2 for src/Actions/AtomAction/SaturateAction.cpp

Timestamp:

May 25, 2016, 7:13:59 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Parents:

9cf90e

git-author:

Frederik Heber <heber@…> (05/10/16 21:23:50)

git-committer:

Frederik Heber <heber@…> (05/25/16 07:13:59)

Message:

Revert "Removing SphericalPointDistribution::getSimplePolygon() to allow for easy rebasing of very old branch on top."

This reverts commit c8fd68b29755db45c6c61c8b73eba4c88480c5bf.

Conflicts:

src/Fragmentation/Exporters/SphericalPointDistribution.cpp
src/Fragmentation/Exporters/SphericalPointDistribution.hpp

• needed to reattach SphericalPointDistribution::getSimplifiedPolygon() that was removed in order to ease rebasing a very old branch on top.
• SaturateAction changed to use WeightedPolygon_t and getRemainingPoints().

File:

• src/Actions/AtomAction/SaturateAction.cpp (modified) (1 diff)

src/Actions/AtomAction/SaturateAction.cpp

@@ -84 +84 @@
     // check for any bonds and get vacant positions
     SphericalPointDistribution::Polygon_t vacant_positions;
-//    const BondList& ListOfBonds = _atom->getListOfBonds();
-//    SphericalPointDistribution PointSphere(typical_distance);
-//    if (ListOfBonds.size() == 0) {
-//      vacant_positions = PointSphere.getSimplePolygon(_atom->getType()->getNoValenceOrbitals());
-//      LOG(3, "DEBUG: Using ideal positions as " << vacant_positions);
-//    } else {
-//      // get ideal polygon and currently occupied positions
-//      const SphericalPointDistribution::Polygon_t ideal_positions =
-//          PointSphere.getSimplePolygon(_atom->getType()->getNoValenceOrbitals());
-//      LOG(3, "DEBUG: ideal positions are " << ideal_positions);
-//      SphericalPointDistribution::Polygon_t current_positions;
-//      for (BondList::const_iterator bonditer = ListOfBonds.begin();
-//          bonditer != ListOfBonds.end(); ++bonditer) {
-//        const Vector position =
-//            (*bonditer)->GetOtherAtom(_atom)->getPosition().getVectorToPoint(_atom->getPosition());
-//        current_positions.push_back((1./position.Norm())*position);
-//      }
-//      LOG(3, "DEBUG: current occupied positions are " << current_positions);
-//
-//      // find the best matching rotated polygon
-//      vacant_positions = SphericalPointDistribution::matchSphericalPointDistributions(
-//          current_positions,
-//          ideal_positions);
-//      LOG(3, "DEBUG: Resulting vacant positions are " << vacant_positions);
-//
-//      // scale vacant positions to typical_distance
-//      std::for_each(
-//          vacant_positions.begin(), vacant_positions.end(),
-//          boost::bind(&Vector::Scale, _1, boost::cref(typical_distance)));
-//    }
+    const BondList& ListOfBonds = _atom->getListOfBonds();
+    SphericalPointDistribution PointSphere(typical_distance);
+    if (ListOfBonds.size() == 0) {
+      vacant_positions = PointSphere.getSimplePolygon(_atom->getType()->getNoValenceOrbitals());
+      LOG(3, "DEBUG: Using ideal positions as " << vacant_positions);
+    } else {
+      // get ideal polygon and currently occupied positions
+      const SphericalPointDistribution::Polygon_t ideal_positions =
+          PointSphere.getSimplePolygon(_atom->getType()->getNoValenceOrbitals());
+      LOG(3, "DEBUG: ideal positions are " << ideal_positions);
+      SphericalPointDistribution::WeightedPolygon_t current_positions;
+      for (BondList::const_iterator bonditer = ListOfBonds.begin();
+          bonditer != ListOfBonds.end(); ++bonditer) {
+        const Vector position =
+            (*bonditer)->GetOtherAtom(_atom)->getPosition().getVectorToPoint(_atom->getPosition());
+        current_positions.push_back(
+            std::make_pair( (1./position.Norm())*position, (*bonditer)->getDegree() ));
+      }
+      LOG(3, "DEBUG: current occupied positions are " << current_positions);
+
+      // find the best matching rotated polygon
+      vacant_positions = PointSphere.getRemainingPoints(
+          current_positions,
+          _atom->getType()->getNoValenceOrbitals());
+      LOG(3, "DEBUG: Resulting vacant positions are " << vacant_positions);
+
+      // scale vacant positions to typical_distance
+      std::for_each(
+          vacant_positions.begin(), vacant_positions.end(),
+          boost::bind(&Vector::Scale, _1, boost::cref(typical_distance)));
+      LOG(3, "DEBUG: Rescaled vacant positions are " << vacant_positions);
+    }
 
     // add the hydrogens