Changeset ec9bd2 for src/Fragmentation

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().

Location:

src/Fragmentation/Exporters

Files:

• SphericalPointDistribution.cpp (modified) (1 diff)
• SphericalPointDistribution.hpp (modified) (1 diff)

src/Fragmentation/Exporters/SphericalPointDistribution.cpp

@@ -1027 +1027 @@
     return points;
 }
+
+SphericalPointDistribution::Polygon_t
+SphericalPointDistribution::getSimplePolygon(const int _NumberOfPoints) const
+{
+  Polygon_t returnpolygon;
+
+        switch (_NumberOfPoints)
+        {
+          case 0:
+            returnpolygon = get<0>();
+            break;
+          case 1:
+            returnpolygon = get<1>();
+            break;
+          case 2:
+            returnpolygon = get<2>();
+            break;
+          case 3:
+            returnpolygon = get<3>();
+            break;
+          case 4:
+            returnpolygon = get<4>();
+            break;
+          case 5:
+            returnpolygon = get<5>();
+            break;
+          case 6:
+            returnpolygon = get<6>();
+            break;
+          case 7:
+            returnpolygon = get<7>();
+            break;
+          case 8:
+            returnpolygon = get<8>();
+            break;
+          case 9:
+            returnpolygon = get<9>();
+            break;
+          case 10:
+            returnpolygon = get<10>();
+            break;
+          case 11:
+            returnpolygon = get<11>();
+            break;
+          case 12:
+            returnpolygon = get<12>();
+            break;
+          case 14:
+            returnpolygon = get<14>();
+            break;
+          default:
+            ASSERT(0, "SphericalPointDistribution::initSelf() - cannot deal with the case "
+                +toString(_NumberOfPoints)+".");
+        }
+
+        return returnpolygon;
+}
+

src/Fragmentation/Exporters/SphericalPointDistribution.hpp

@@ -71 +71 @@
     ASSERT(0, "SphericalPointDistribution::getConnections() - not specialized for "+toString(N)+".");
   }
+
+  /** Initializes the polygon with the given \a _NumberOfPoints.
+   *
+   * \param _NumberOfPoints number of points
+   */
+  Polygon_t getSimplePolygon(const int _NumberOfPoints) const;
 
   /** Returns vacant spots to fill to get a complete spherical point distribution from