Changeset cc9225 for molecuilder/src/moleculelist.cpp

Timestamp:

Nov 24, 2009, 3:34:49 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

1a3354

Parents:

7d1ad9

Message:

Fixes and naming of final Tecplot output file is now molecule name.

• FIXES to builder.cpp:
  • case 'p' would not dissect the molecule into connected subgraphs
  • if done so, the BondGraph was not yet initialised
  • if done so, we need to check whether BondGraphFileName has been set
  • BondGraphFileName.empty() could not be used as a check, as was set to "" instead of "\n"
  • if (finally) done so, we have to remove the empty molecule that we parsed in
  • ... and then pick the newly added molecule for mol to point at
  • SaveConfig() did not set the merged molecule name correctly.
  • if empty config is given, the empty molecule now receives the ConfigFileName as name

• FIXES to config.cpp
  • Load() did not set the name of the molecule

• changes to tesselationhelper.cpp and tesselation.cpp
  • WriteTecplotFile() uses N == -1 to make clear, that we are writing the final not a temporary tecplot file and then uses the molecule's name instead of the last triangle's endpoints
  • FindNextSuitableTriangle(): HasOtherBaselineBetterCandidate() was commented out for the moment (as it is not yet final and makes all the test fail)
  • IncludeSphereinRaster3D() did not check whether LastTriangle was NULL or not

• MoleculeListClass::DissectMoleculeIntoConnectedSubgraphs() names the subgraphs with suffixes "..-1", "..-2", ...

• changes to PointCloud and molecule
  • new virtual function PointCloud::GetName() returns "unknown"
  • new function molecule::GetName() returns pointer to name of molecule
  • IsEmpty() and IsEnd() now return true by default

• all .dat files in the "Tesselations" tests were changed accordingly (i.e. have now the name in the second line)
• benzene was added as a new test for an absolutely flat molecule. So far, it fails horribly.
• 13 of 17 tests run fine

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/moleculelist.cpp (modified) (2 diffs)

molecuilder/src/moleculelist.cpp

@@ -760 +760 @@
   // 4a. create array of molecules to fill
   const int MolCount = Subgraphs->next->Count();
+  char number[MAXSTRINGSIZE];
   molecule **molecules = Malloc<molecule *>(MolCount, "config::Load() - **molecules");
   for (int i=0;i<MolCount;i++) {
     molecules[i] = (molecule*) new molecule(mol->elemente);
     molecules[i]->ActiveFlag = true;
+    strncpy(molecules[i]->name, mol->name, MAXSTRINGSIZE);
+    if (MolCount > 1) {
+      sprintf(number, "-%d", i+1);
+      strncat(molecules[i]->name, number, MAXSTRINGSIZE - strlen(mol->name) - 1);
+    }
+    cout << "MolName is " << molecules[i]->name << endl;
     insert(molecules[i]);
   }
@@ -800 +807 @@
     }
   }
-  // 4d. we don't need to redo bonds, as they are connected subgraphs and still maintained their ListOfBonds, but we have to remove them from first..last list
+  // 4d. we don't need to redo bonds, as they are connected subgraphs and still maintain their ListOfBonds, but we have to remove them from first..last list
   bond *Binder = mol->first;
   while (mol->first->next != mol->last) {