Changeset 6d7651 for molecuilder/src/tesselationhelpers.cpp

Timestamp:

Oct 27, 2009, 5:41:12 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

dbc152

Parents:

069034

Message:

Refactored tesselationhelpers.cpp with respect to ticket #38 (make const what is const).
Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/tesselationhelpers.cpp (modified) (21 diffs)

molecuilder/src/tesselationhelpers.cpp

@@ -14 +14 @@
 #include "verbose.hpp"
 
-double DetGet(gsl_matrix *A, int inPlace) {
+double DetGet(gsl_matrix * const A, const int inPlace) {
   /*
   inPlace = 1 => A is replaced with the LU decomposed copy.
@@ -42 +42 @@
 };
 
-void GetSphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
+void GetSphere(Vector * const center, const Vector &a, const Vector &b, const Vector &c, const double RADIUS)
 {
   gsl_matrix *A = gsl_matrix_calloc(3,3);
@@ -96 +96 @@
  * @param b vector second point of triangle
  * @param c vector third point of triangle
- * @param *Umkreismittelpunkt new cneter point of circumference
+ * @param *Umkreismittelpunkt new center point of circumference
  * @param Direction vector indicates up/down
- * @param AlternativeDirection vecotr, needed in case the triangles have 90 deg angle
+ * @param AlternativeDirection Vector, needed in case the triangles have 90 deg angle
  * @param Halfplaneindicator double indicates whether Direction is up or down
- * @param AlternativeIndicator doube indicates in case of orthogonal triangles which direction of AlternativeDirection is suitable
+ * @param AlternativeIndicator double indicates in case of orthogonal triangles which direction of AlternativeDirection is suitable
  * @param alpha double angle at a
  * @param beta double, angle at b
@@ -107 +107 @@
  * @param Umkreisradius double radius of circumscribing circle
  */
-void GetCenterOfSphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
-    double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius)
+void GetCenterOfSphere(Vector* const & Center, const Vector &a, const Vector &b, const Vector &c, Vector * const NewUmkreismittelpunkt, const Vector* const Direction, const Vector* const AlternativeDirection,
+    const double HalfplaneIndicator, const double AlternativeIndicator, const double alpha, const double beta, const double gamma, const double RADIUS, const double Umkreisradius)
 {
   Vector TempNormal, helper;
@@ -171 +171 @@
  * \param *c third point
  */
-void GetCenterofCircumcircle(Vector *Center, Vector *a, Vector *b, Vector *c)
+void GetCenterofCircumcircle(Vector * const Center, const Vector &a, const Vector &b, const Vector &c)
 {
   Vector helper;
@@ -177 +177 @@
   Vector SideA, SideB, SideC;
   SideA.CopyVector(b);
-  SideA.SubtractVector(c);
+  SideA.SubtractVector(&c);
   SideB.CopyVector(c);
-  SideB.SubtractVector(a);
+  SideB.SubtractVector(&a);
   SideC.CopyVector(a);
-  SideC.SubtractVector(b);
+  SideC.SubtractVector(&b);
   alpha = M_PI - SideB.Angle(&SideC);
   beta = M_PI - SideC.Angle(&SideA);
@@ -215 +215 @@
  * \return Angle between \a NewSphereCenter and \a OldSphereCenter relative to \a CircleCenter, 2.*M_PI if one test fails
  */
-double GetPathLengthonCircumCircle(Vector &CircleCenter, Vector &CirclePlaneNormal, double CircleRadius, Vector &NewSphereCenter, Vector &OldSphereCenter, Vector &NormalVector, Vector &SearchDirection)
+double GetPathLengthonCircumCircle(const Vector &CircleCenter, const Vector &CirclePlaneNormal, const double CircleRadius, const Vector &NewSphereCenter, const Vector &OldSphereCenter, const Vector &NormalVector, const Vector &SearchDirection)
 {
   Vector helper;
@@ -300 +300 @@
  * @return true if there is an intersection between the given lines, false otherwise
  */
-bool existsIntersection(Vector point1, Vector point2, Vector point3, Vector point4)
+bool existsIntersection(const Vector &point1, const Vector &point2, const Vector &point3, const Vector &point4)
 {
   bool result;
@@ -403 +403 @@
  * @return angle between point and reference
  */
-double GetAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector)
+double GetAngle(const Vector &point, const Vector &reference, const Vector &OrthogonalVector)
 {
   if (reference.IsZero())
@@ -429 +429 @@
  * \return \f$ \frac{1}{6} \cdot ((a-d) \times (a-c) \cdot  (a-b)) \f$
  */
-double CalculateVolumeofGeneralTetraeder(Vector *a, Vector *b, Vector *c, Vector *d)
+double CalculateVolumeofGeneralTetraeder(const Vector &a, const Vector &b, const Vector &c, const Vector &d)
 {
   Vector Point, TetraederVector[3];
@@ -438 +438 @@
   TetraederVector[2].CopyVector(c);
   for (int j=0;j<3;j++)
-    TetraederVector[j].SubtractVector(d);
+    TetraederVector[j].SubtractVector(&d);
   Point.CopyVector(&TetraederVector[0]);
   Point.VectorProduct(&TetraederVector[1]);
@@ -452 +452 @@
  * \return true - there is such a line (i.e. creation of degenerated triangle is valid), false - no such line (don't create)
  */
-bool CheckLineCriteriaForDegeneratedTriangle(const BoundaryPointSet *nodes[3])
+bool CheckLineCriteriaForDegeneratedTriangle(const BoundaryPointSet * const nodes[3])
 {
   bool result = false;
@@ -536 +536 @@
  * @return point which is second closest to the provided one
  */
-TesselPoint* FindSecondClosestPoint(const Vector* Point, LinkedCell* LC)
+TesselPoint* FindSecondClosestPoint(const Vector* Point, const LinkedCell* const LC)
 {
   TesselPoint* closestPoint = NULL;
@@ -649 +649 @@
  * \return Vector on reference line that has closest distance
  */
-Vector * GetClosestPointBetweenLine(ofstream *out, const BoundaryLineSet *Base, const BoundaryLineSet *OtherBase)
+Vector * GetClosestPointBetweenLine(ofstream *out, const BoundaryLineSet * const Base, const BoundaryLineSet * const OtherBase)
 {
   // construct the plane of the two baselines (i.e. take both their directional vectors)
@@ -689 +689 @@
  * \return distance between \a *x and plane defined by \a *triangle, -1 - if something went wrong
  */
-double DistanceToTrianglePlane(ofstream *out, const Vector *x, const BoundaryTriangleSet *triangle)
+double DistanceToTrianglePlane(ofstream * const out, const Vector *x, const BoundaryTriangleSet * const triangle)
 {
   double distance = 0.;
@@ -705 +705 @@
  * \param *mol molecule structure with atom positions
  */
-void WriteVrmlFile(ofstream *out, ofstream *vrmlfile, const Tesselation *Tess, const PointCloud *cloud)
+void WriteVrmlFile(ofstream * const out, ofstream * const vrmlfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   TesselPoint *Walker = NULL;
@@ -748 +748 @@
  * \param *mol molecule structure with atom positions
  */
-void IncludeSphereinRaster3D(ofstream *out, ofstream *rasterfile, const Tesselation *Tess, const PointCloud *cloud)
+void IncludeSphereinRaster3D(ofstream * const out, ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   Vector helper;
@@ -773 +773 @@
  * \param *mol molecule structure with atom positions
  */
-void WriteRaster3dFile(ofstream *out, ofstream *rasterfile, const Tesselation *Tess, const PointCloud *cloud)
+void WriteRaster3dFile(ofstream * const out, ofstream * const rasterfile, const Tesselation * const Tess, const PointCloud * const cloud)
 {
   TesselPoint *Walker = NULL;
@@ -818 +818 @@
  * \param N arbitrary number to differentiate various zones in the tecplot format
  */
-void WriteTecplotFile(ofstream *out, ofstream *tecplot, const Tesselation *TesselStruct, const PointCloud *cloud, const int N)
+void WriteTecplotFile(ofstream * const out, ofstream * const tecplot, const Tesselation * const TesselStruct, const PointCloud * const cloud, const int N)
 {
   if ((tecplot != NULL) && (TesselStruct != NULL)) {
@@ -859 +859 @@
  * \param *TesselStruct pointer to Tesselation structure
  */
-void CalculateConcavityPerBoundaryPoint(ofstream *out, const Tesselation *TesselStruct)
+void CalculateConcavityPerBoundaryPoint(ofstream * const out, const Tesselation * const TesselStruct)
 {
   class BoundaryPointSet *point = NULL;
@@ -886 +886 @@
  * \return true - all have exactly two triangles, false - some not, list is printed to screen
  */
-bool CheckListOfBaselines(ofstream *out, const Tesselation *TesselStruct)
+bool CheckListOfBaselines(ofstream * const out, const Tesselation * const TesselStruct)
 {
   LineMap::const_iterator testline;