Changeset 86cff86 for src

Timestamp:

Jul 7, 2010, 11:53:05 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

ed6dd8

Parents:

192f6e

Message:

InputAction now parses all possible formats, not only pcp.

• new function FormatParserStorage::get() that checks on the suffix and calls the load() function of the respective specialized FormatParser.
• InputAction changed such that ...
  • prefix and suffix are extracted.
  • FormatParserStorage::get() is used.
  • empty configs are handled, too.
• FormatParserStorage::ParserSuffix changed, removed ".conf".
• TESTFIX: renamed all files to diff accordingly: .conf.xyz -> .xyz, .conf.in -> .in
• BUGFIX: xyz files were written without initial tab in front of comment, fix in ParserUnitTest necessary (i.e. a tab was missing there as we always write it now)
• ChangeElementAction: now needs --atom-by-id and takes the element as argument

Location:

src

Files:

• Actions/AtomAction/ChangeElementAction.cpp (modified) (1 diff)
• Actions/MapOfActions.cpp (modified) (1 diff)
• Actions/WorldAction/InputAction.cpp (modified) (2 diffs)
• Parser/FormatParserStorage.cpp (modified) (2 diffs)
• Parser/FormatParserStorage.hpp (modified) (1 diff)
• Parser/XyzParser.cpp (modified) (2 diffs)
• unittests/ParserUnitTest.cpp (modified) (1 diff)

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -38 +38 @@
   std::vector<element *> elements;
 
-  dialog->queryAtom(NAME, &first, MapOfActions::getInstance().getDescription(NAME));
-  dialog->queryElement("element", &elements, MapOfActions::getInstance().getDescription("element"));
+  dialog->queryElement(NAME, &elements, MapOfActions::getInstance().getDescription(NAME));
+  dialog->queryAtom("atom-by-id", &first, MapOfActions::getInstance().getDescription("atom-by-id"));
 
   if(dialog->display()) {

src/Actions/MapOfActions.cpp

@@ -270 +270 @@
   TypeMap["center-in-box"] = Box;
   TypeMap["change-box"] = Box;
-  TypeMap["change-element"] = Atom;
+  TypeMap["change-element"] = Element;
   TypeMap["change-molname"] = String;
   TypeMap["convex-envelope"] = Molecule;

src/Actions/WorldAction/InputAction.cpp

@@ -38 +38 @@
   MoleculeListClass *molecules = World::getInstance().getMolecules();
   molecule *mol = NULL;
-  string filename;
+  std::string filename;
   std::ifstream test;
 
@@ -45 +45 @@
   if(dialog->display()) {
     DoLog(0) && (Log() << Verbose(0) << "Config file given." << endl);
-    std::string FilenamePrefix = filename.substr(0,filename.find('.'));
-    FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
-    DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
-    test.open(filename.c_str());
-    if (test == NULL) {
-      DoLog(1) && (Log() << Verbose(1) << "Specified config file " << filename << " not found." << endl);
+    if (filename.find('.') != string::npos) {
+      std::string FilenamePrefix = filename.substr(0,filename.find_last_of('.'));
+      std::string FilenameSuffix = filename.substr(filename.find_last_of('.')+1, filename.length());
+      DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
+      test.open(filename.c_str());
+      if (test == NULL) {
+        DoLog(1) && (Log() << Verbose(1) << "Specified config file " << filename << " not found." << endl);
+      } else {
+        DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
+        FormatParserStorage::getInstance().get((std::istream &)test, FilenameSuffix);
+        test.close();
+      }
+      FormatParserStorage::getInstance().SetOutputPrefixForAll(FilenamePrefix);
+      // set mol to first active molecule
+      if (molecules->ListOfMolecules.size() != 0) {
+        for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
+          if ((*ListRunner)->ActiveFlag) {
+            mol = *ListRunner;
+            break;
+          }
+      }
+      if (mol == NULL) {
+        mol = World::getInstance().createMolecule();
+        mol->ActiveFlag = true;
+        molecules->insert(mol);
+      }
+      mol->SetNameFromFilename(filename.substr(0,filename.find('.')).c_str());
     } else {
-      DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
-      FormatParserStorage::getInstance().getPcp().load(&test);
-      test.close();
+      DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
     }
-    // set mol to first active molecule
-    if (molecules->ListOfMolecules.size() != 0) {
-      for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
-        if ((*ListRunner)->ActiveFlag) {
-          mol = *ListRunner;
-          break;
-        }
-    }
-    if (mol == NULL) {
-      mol = World::getInstance().createMolecule();
-      mol->ActiveFlag = true;
-      molecules->insert(mol);
-    }
-    mol->SetNameFromFilename(filename.c_str());
     delete dialog;
     return Action::success;

src/Parser/FormatParserStorage.cpp

@@ -42 +42 @@
   ParserSuffix.resize(ParserTypes_end, "");
 
-  ParserSuffix[mpqc] = "conf.in";
+  ParserSuffix[mpqc] = "in";
   ParserSuffix[pcp] = "conf";
-  ParserSuffix[tremolo] = "conf.data";
-  ParserSuffix[xyz] = "conf.xyz";
+  ParserSuffix[tremolo] = "data";
+  ParserSuffix[xyz] = "xyz";
 }
 
@@ -133 +133 @@
 }
 
+/** Parses an istream depending on its suffix
+ * \param &input input stream
+ * \param suffix
+ * \return true - parsing ok, false - suffix unknown
+ */
+bool FormatParserStorage::get(std::istream &input, std::string suffix)
+{
+  if (suffix == ParserSuffix[mpqc]) {
+    getMpqc().load(&input);
+  } else if (suffix == ParserSuffix[pcp]) {
+    getPcp().load(&input);
+  } else if (suffix == ParserSuffix[tremolo]) {
+    getTremolo().load(&input);
+  } else if (suffix == ParserSuffix[xyz]) {
+    getXyz().load(&input);
+  } else {
+    DoeLog(1) && (eLog() << Verbose(1) << "Unknown suffix to for FormatParserStorage::get()." << endl);
+    return false;
+  }
+  return true;
+}
+
 /** Returns reference to the output MpqcParser, adds if not present.
  * \return reference to the output MpqcParser

src/Parser/FormatParserStorage.hpp

@@ -41 +41 @@
   void addXyz();
 
+  bool get(std::istream &input, std::string suffix);
   MpqcParser &getMpqc();
   PcpParser &getPcp();

src/Parser/XyzParser.cpp

@@ -59 +59 @@
   if (comment == "") {
     time_t now = time((time_t *)NULL);   // Get the system time and put it into 'now' as 'calender time'
-    comment = "\tCreated by molecuilder on ";
+    comment = "Created by molecuilder on ";
     // ctime ends in \n\0, we have to cut away the newline
     std::string time(ctime(&now));
@@ -68 +68 @@
       comment += time;
   }
-  *file << World::getInstance().numAtoms() << endl << comment << endl;
+  *file << World::getInstance().numAtoms() << endl << "\t" << comment << endl;
 
   vector<atom*> atoms = World::getInstance().getAllAtoms();

src/unittests/ParserUnitTest.cpp

@@ -131 +131 @@
 \tmolecule = $:molecule\n\
 )\n";
-static string waterXyz = "3\nH2O: water molecule\nO\t0\t0\t0\nH\t0.758602\t0\t0.504284\nH\t0.758602\t0\t-0.504284\n";
+static string waterXyz = "3\n\tH2O: water molecule\nO\t0\t0\t0\nH\t0.758602\t0\t0.504284\nH\t0.758602\t0\t-0.504284\n";
 static string Tremolo_Atomdata1 = "# ATOMDATA\tId\tname\tType\tx=3\n";
 static string Tremolo_Atomdata2 = "#\n#ATOMDATA Id name Type x=3\n1 hydrogen H 3.0 4.5 0.1\n\n";