Changeset a68d44 for molecuilder/src

Timestamp:

Nov 26, 2009, 11:40:01 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

2c0e4e, 9600a7

Parents:

013ad57

Message:

removing automatic dissection on loading, Tesselations test now checks for return value only not for precise order of the triangles.

• FindNonConvexBorder() returns bool depending on the result of CheckListOfBaselines()
• BUG: ParseCommandLineOptions(): case 'p' (parsing) does not dissect the molecule, as we have to wait for e.g. '-A' before we may use the bond structure. Same for config::Load()

Location:

molecuilder/src

Files:

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

molecuilder/src/boundary.cpp

@@ -946 +946 @@
  * \param RADIUS radius of the virtual sphere
  * \param *filename filename prefix for output of vertex data
- */
-void FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LCList, const double RADIUS, const char *filename = NULL)
+ * \return true - tesselation successful, false - tesselation failed
+ */
+bool FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LCList, const double RADIUS, const char *filename = NULL)
 {
         Info FunctionInfo(__func__);
   bool freeLC = false;
+  bool status = false;
   CandidateForTesselation *baseline;
   LineMap::iterator testline;
@@ -1017 +1019 @@
     }
   }
-  // check envelope for consistency
-  CheckListOfBaselines(TesselStruct);
-
-  // look whether all points are inside of the convex envelope, otherwise add them via degenerated triangles
-  //->InsertStraddlingPoints(mol, LCList);
+//  // check envelope for consistency
+//  status = CheckListOfBaselines(TesselStruct);
+//
+//  // look whether all points are inside of the convex envelope, otherwise add them via degenerated triangles
+//  //->InsertStraddlingPoints(mol, LCList);
 //  mol->GoToFirst();
 //  class TesselPoint *Runner = NULL;
@@ -1038 +1040 @@
 //  // Purges surplus triangles.
 //  TesselStruct->RemoveDegeneratedTriangles();
-//
-//  // check envelope for consistency
-//  CheckListOfBaselines(TesselStruct);
+
+  // check envelope for consistency
+  status = CheckListOfBaselines(TesselStruct);
 
   // write final envelope
@@ -1048 +1050 @@
   if (freeLC)
     delete(LCList);
+
+  return status;
 };
 

molecuilder/src/boundary.hpp

@@ -53 +53 @@
 Vector* FindEmbeddingHole(MoleculeListClass *mols, molecule *srcmol);
 void FindNextSuitablePoint(class BoundaryTriangleSet *BaseTriangle, class BoundaryLineSet *BaseLine, atom*& OptCandidate, Vector *OptCandidateCenter, double *ShortestAngle, const double RADIUS, LinkedCell *LC);
-void FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LC, const double RADIUS, const char *tempbasename);
+bool FindNonConvexBorder(const molecule* const mol, Tesselation *&TesselStruct, const LinkedCell *&LC, const double RADIUS, const char *tempbasename);
 Boundaries *GetBoundaryPoints(const molecule *mol, Tesselation *&TesselStruct);
 double * GetDiametersOfCluster(const Boundaries *BoundaryPtr, const molecule *mol, Tesselation *&TesselStruct, const bool IsAngstroem);

molecuilder/src/builder.cpp

@@ -1574 +1574 @@
                 else {
                   Log() << Verbose(2) << "File found and parsed." << endl;
-                  mol->SetNameFromFilename(argv[argptr]);
-                  molecules->ListOfMolecules.remove(mol);
-                  molecules->DissectMoleculeIntoConnectedSubgraphs(mol,&configuration);
-                  delete(mol);
-                  if (molecules->ListOfMolecules.size() != 0) {
-                    for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-                      if ((*ListRunner)->ActiveFlag) {
-                        mol = *ListRunner;
-                        break;
-                      }
-                  }
+                  // @TODO rather do the dissection afterwards
+//                  mol->SetNameFromFilename(argv[argptr]);
+//                  molecules->ListOfMolecules.remove(mol);
+//                  molecules->DissectMoleculeIntoConnectedSubgraphs(mol,&configuration);
+//                  delete(mol);
+//                  if (molecules->ListOfMolecules.size() != 0) {
+//                    for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
+//                      if ((*ListRunner)->ActiveFlag) {
+//                        mol = *ListRunner;
+//                        break;
+//                      }
+//                  }
                   configPresent = present;
                 }
@@ -1803 +1804 @@
                 start = clock();
                 LCList = new LinkedCell(Boundary, atof(argv[argptr])*2.);
-                FindNonConvexBorder(Boundary, T, LCList, atof(argv[argptr]), argv[argptr+1]);
+                if (!FindNonConvexBorder(Boundary, T, LCList, atof(argv[argptr]), argv[argptr+1]))
+                  ExitFlag = 255;
                 //FindDistributionOfEllipsoids(T, &LCList, N, number, filename.c_str());
                 end = clock();

molecuilder/src/config.cpp

@@ -1069 +1069 @@
   mol->SetNameFromFilename(filename);
   mol->ActiveFlag = true;
+  MolList->insert(mol);
 
   // 4. dissect the molecule into connected subgraphs
-  MolList->DissectMoleculeIntoConnectedSubgraphs(mol,this);
+  // don't do this here ...
+  //MolList->DissectMoleculeIntoConnectedSubgraphs(mol,this);
 
   delete(mol);