Changeset eeae5b for molecuilder/src

Timestamp:

Jul 7, 2009, 8:11:47 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

54de04

Parents:

d2639f

Message:

Cosmetical changes in Find_third_point_for_tesselation() and FinDistributionOfEllipsoids commented out in builder.

Location:

molecuilder/src

Files:

• boundary.cpp (modified) (2 diffs)
• builder.cpp (modified) (1 diff)

molecuilder/src/boundary.cpp

@@ -2379 +2379 @@
                     if (radius < RADIUS*RADIUS) {
                       helper.Scale(sqrt(RADIUS*RADIUS - radius));
-                      cout << Verbose(3) << "INFO: Distance of NewCircleCenter to NewSphereCenter is " << helper.Norm() << "." << endl;
+                      cout << Verbose(2) << "INFO: Distance of NewCircleCenter to NewSphereCenter is " << helper.Norm() << " with sphere radius " << RADIUS << "." << endl;
                       NewSphereCenter.AddVector(&helper);
                       NewSphereCenter.SubtractVector(&CircleCenter);
@@ -2390 +2390 @@
                       cout << Verbose(2) << "INFO: OtherNewSphereCenter is at " << OtherNewSphereCenter << "." << endl;
 
-                          alpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, NewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
+                      alpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, NewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
                       Otheralpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, OtherNewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
                       alpha = min(alpha, Otheralpha);
-                                          // if there is a better candidate, drop the current list and add the new candidate
-                                          // otherwise ignore the new candidate and keep the list
-                                          if (*ShortestAngle > (alpha - HULLEPSILON)) {
-                                                  optCandidate = new CandidateForTesselation(Candidate, BaseLine, OptCandidateCenter, OtherOptCandidateCenter);
-                                                  if (fabs(alpha - Otheralpha) > MYEPSILON) {
-                                                          optCandidate->OptCenter.CopyVector(&NewSphereCenter);
-                                                          optCandidate->OtherOptCenter.CopyVector(&OtherNewSphereCenter);
-                                                  } else {
-                                                          optCandidate->OptCenter.CopyVector(&OtherNewSphereCenter);
-                                                          optCandidate->OtherOptCenter.CopyVector(&NewSphereCenter);
-                                                  }
-                                                  // if there is an equal candidate, add it to the list without clearing the list
-                                                  if ((*ShortestAngle - HULLEPSILON) < alpha) {
-                                                          candidates->push_back(optCandidate);
-                                                          cout << Verbose(1) << "ACCEPT: We have found an equally good candidate: " << *(optCandidate->point) << " with "
-                                                                  << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
-                                                  } else {
-                                                          candidates->clear();
-                                                          candidates->push_back(optCandidate);
-                                                          cout << Verbose(1) << "ACCEPT: We have found a better candidate: " << *(optCandidate->point) << " with "
-                                                                  << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
-                                                  }
-                                                  *ShortestAngle = alpha;
-                                                  cout << Verbose(2) << "INFO: There are " << candidates->size() << " candidates in the list now." << endl;
-                                          } else {
-                                                  if ((optCandidate != NULL) && (optCandidate->point != NULL))
-                                                          cout << Verbose(1) << "REJECT: Old candidate: " << *(optCandidate->point) << " is better than " << alpha << " with " << *ShortestAngle << "." << endl;
-                                                  else
-                                                          cout << Verbose(2) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
-                                          }
+                      // if there is a better candidate, drop the current list and add the new candidate
+                      // otherwise ignore the new candidate and keep the list
+                      if (*ShortestAngle > (alpha - HULLEPSILON)) {
+                        optCandidate = new CandidateForTesselation(Candidate, BaseLine, OptCandidateCenter, OtherOptCandidateCenter);
+                        if (fabs(alpha - Otheralpha) > MYEPSILON) {
+                          optCandidate->OptCenter.CopyVector(&NewSphereCenter);
+                          optCandidate->OtherOptCenter.CopyVector(&OtherNewSphereCenter);
+                        } else {
+                          optCandidate->OptCenter.CopyVector(&OtherNewSphereCenter);
+                          optCandidate->OtherOptCenter.CopyVector(&NewSphereCenter);
+                        }
+                        // if there is an equal candidate, add it to the list without clearing the list
+                        if ((*ShortestAngle - HULLEPSILON) < alpha) {
+                          candidates->push_back(optCandidate);
+                          cout << Verbose(1) << "ACCEPT: We have found an equally good candidate: " << *(optCandidate->point) << " with "
+                            << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
+                        } else {
+                          candidates->clear();
+                          candidates->push_back(optCandidate);
+                          cout << Verbose(1) << "ACCEPT: We have found a better candidate: " << *(optCandidate->point) << " with "
+                            << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
+                        }
+                        *ShortestAngle = alpha;
+                        cout << Verbose(2) << "INFO: There are " << candidates->size() << " candidates in the list now." << endl;
+                      } else {
+                        if ((optCandidate != NULL) && (optCandidate->point != NULL))
+                          cout << Verbose(1) << "REJECT: Old candidate: " << *(optCandidate->point) << " is better than " << alpha << " with " << *ShortestAngle << "." << endl;
+                        else
+                          cout << Verbose(2) << "REJECT: Candidate " << *Candidate << " with " << alpha << " was rejected." << endl;
+                      }
 
                     } else {

molecuilder/src/builder.cpp

@@ -1493 +1493 @@
                                                                 LinkedCell LCList(mol, atof(argv[argptr]));             // \NOTE not twice the radius??
                                                                 Find_non_convex_border((ofstream *)&cout, mol, &T, &LCList, argv[argptr+1], atof(argv[argptr]));
-                                                                FindDistributionOfEllipsoids((ofstream *)&cout, &T, &LCList, N, number, filename.c_str());
+                                                                //FindDistributionOfEllipsoids((ofstream *)&cout, &T, &LCList, N, number, filename.c_str());
                                                                 argptr+=2;
                                                         }