Changeset 669a7e for molecuilder/src

Timestamp:

Jul 9, 2009, 10:38:34 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

c12297

Parents:

61e92a

git-author:

Frederik Heber <heber@…> (07/09/09 10:36:26)

git-committer:

Frederik Heber <heber@…> (07/09/09 10:38:34)

Message:

fixed compiler warning by changing int to size_t because C++ STL set.size() returns size_t.

• changed in PickRandomPointSet...() (PointsPicked, PointsLeft, ...)
• in boundary.cpp some unnecessary variables were removed also

Location:

molecuilder/src

Files:

• boundary.cpp (modified) (8 diffs)
• ellipsoid.cpp (modified) (4 diffs)
• ellipsoid.hpp (modified) (1 diff)

molecuilder/src/boundary.cpp

@@ -1899 +1899 @@
   double *ShortestAngle, const double RADIUS, LinkedCell *LC
 ) {
-  atom *Walker = NULL;
   Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
   Vector CirclePlaneNormal; // normal vector defining the plane this circle lives in
@@ -1911 +1910 @@
   double radius;
   double alpha, Otheralpha; // angles (i.e. parameter for the circle).
-  double Nullalpha; // angle between OldSphereCenter and NormalVector of base triangle
   int N[NDIM], Nlower[NDIM], Nupper[NDIM];
   atom *Candidate = NULL;
@@ -2071 +2069 @@
 };
 
-
 struct Intersection {
         Vector x1;
@@ -2229 +2226 @@
 {
   cout << Verbose(2) << "Begin of Find_second_point_for_Tesselation" << endl;
-  int i;
   Vector AngleCheck;
-  atom* Walker;
   double norm = -1., angle;
   LinkedAtoms *List = NULL;
@@ -2327 +2322 @@
   int i = 0;
   LinkedAtoms *List = NULL;
-  atom* Walker;
-  atom* FirstPoint;
-  atom* SecondPoint;
+  atom* FirstPoint = NULL;
+  atom* SecondPoint = NULL;
   atom* MaxAtom[NDIM];
   double max_coordinate[NDIM];
@@ -2505 +2499 @@
   ofstream *tempstream = NULL;
   char NumberName[255];
-  double tmp;
   bool result = true;
   CandidateList *Opt_Candidates = new CandidateList();
@@ -2662 +2655 @@
         string NameofTempFile(tempbasename);
         NameofTempFile.append(NumberName);
-        for(size_t npos = NameofTempFile.find_first_of(' '); npos != -1; npos = NameofTempFile.find(' ', npos))
+        for(size_t npos = NameofTempFile.find_first_of(' '); npos != string::npos; npos = NameofTempFile.find(' ', npos))
         NameofTempFile.erase(npos, 1);
         NameofTempFile.append(TecplotSuffix);
@@ -2676 +2669 @@
         string NameofTempFile(tempbasename);
         NameofTempFile.append(NumberName);
-        for(size_t npos = NameofTempFile.find_first_of(' '); npos != -1; npos = NameofTempFile.find(' ', npos))
+        for(size_t npos = NameofTempFile.find_first_of(' '); npos != string::npos; npos = NameofTempFile.find(' ', npos))
         NameofTempFile.erase(npos, 1);
         NameofTempFile.append(Raster3DSuffix);

molecuilder/src/ellipsoid.cpp

@@ -213 +213 @@
  * \param PointsToPick number of points in set to pick
  */
-void PickRandomNeighbouredPointSet(ofstream *out, class Tesselation *T, class LinkedCell *LC, Vector *&x, int PointsToPick)
-{
-        int PointsLeft = 0;
-        int PointsPicked = 0;
-        double value, threshold;
+void PickRandomNeighbouredPointSet(ofstream *out, class Tesselation *T, class LinkedCell *LC, Vector *&x, size_t PointsToPick)
+{
+  size_t PointsLeft = 0;
+  size_t PointsPicked = 0;
         int Nlower[NDIM], Nupper[NDIM];
         set<int> PickedAtomNrs;  // ordered list of picked atoms
@@ -303 +302 @@
                                 }
                 *out << Verbose(2) << "The following points were picked: " << endl;
-                for (int i=0;i<PointsPicked;i++)
+                for (size_t i=0;i<PointsPicked;i++)
                         *out << Verbose(2) << x[i] << endl;
                 if (PointsPicked == PointsToPick)       // break out of loop if we have all
@@ -318 +317 @@
  * \param PointsToPick number of points in set to pick
  */
-void PickRandomPointSet(ofstream *out, class Tesselation *T, Vector *&x, int PointsToPick)
-{
-        int PointsLeft = T->PointsOnBoundaryCount;
-        int PointsPicked = 0;
+void PickRandomPointSet(ofstream *out, class Tesselation *T, Vector *&x, size_t PointsToPick)
+{
+  size_t PointsLeft = (size_t) T->PointsOnBoundaryCount;
+  size_t PointsPicked = 0;
         double value, threshold;
         PointMap *List = &T->PointsOnBoundary;
@@ -348 +347 @@
                 }
         *out << Verbose(2) << "The following points were picked: " << endl;
-        for (int i=0;i<PointsPicked;i++)
+        for (size_t i=0;i<PointsPicked;i++)
                 *out << Verbose(3) << x[i] << endl;
 

molecuilder/src/ellipsoid.hpp

@@ -22 +22 @@
 double SumSquaredDistance (const gsl_vector * x, void * params);
 bool FitPointSetToEllipsoid(ofstream *out, Vector *set, int N, Vector *EllipsoidCenter, double *EllipsoidLength, double *EllipsoidAngle);
-void PickRandomPointSet(ofstream *out, class Tesselation *T, Vector *&x, int N);
-void PickRandomNeighbouredPointSet(ofstream *out, class Tesselation *T, class LinkedCell *LC, Vector *&x, int PointsToPick);
+void PickRandomPointSet(ofstream *out, class Tesselation *T, Vector *&x, size_t PointsToPick);
+void PickRandomNeighbouredPointSet(ofstream *out, class Tesselation *T, class LinkedCell *LC, Vector *&x, size_t PointsToPick);
 void FindDistributionOfEllipsoids(ofstream *out, class Tesselation *T, class LinkedCell *LCList, int N, int number, const char *filename);