Changeset 1fd675 for src/Actions/TesselationAction

Timestamp:

Aug 28, 2010, 12:57:56 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, 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:

966e12

Parents:

53d01c

git-author:

Frederik Heber <heber@…> (08/26/10 21:05:34)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:57:56)

Message:

All Actions are converted to the new macro framework.

• included all three values that have been used to create or convert the files
  • createdef.sh
  • createCpp.sh
  • createHeader.sh

Location:

src/Actions/TesselationAction

Files:

• ConvexEnvelopeAction.cpp (modified) (4 diffs)
• ConvexEnvelopeAction.def (added)
• ConvexEnvelopeAction.hpp (modified) (1 diff)
• NonConvexEnvelopeAction.cpp (modified) (4 diffs)
• NonConvexEnvelopeAction.def (added)
• NonConvexEnvelopeAction.hpp (modified) (1 diff)

src/Actions/TesselationAction/ConvexEnvelopeAction.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Actions/TesselationAction/ConvexEnvelopeAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "boundary.hpp"
 #include "config.hpp"
@@ -36 +34 @@
 using namespace std;
 
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "Actions/TesselationAction/ConvexEnvelopeAction.hpp"
 
-/****** TesselationConvexEnvelopeAction *****/
-
-// memento to remember the state when undoing
-
-//class TesselationConvexEnvelopeState : public ActionState {
-//public:
-//  TesselationConvexEnvelopeState(molecule* _mol,std::string _lastName) :
-//    mol(_mol),
-//    lastName(_lastName)
-//  {}
-//  molecule* mol;
-//  std::string lastName;
-//};
-
-const char TesselationConvexEnvelopeAction::NAME[] = "convex-envelope";
-
-TesselationConvexEnvelopeAction::TesselationConvexEnvelopeAction() :
-  Action(NAME)
-{}
-
-TesselationConvexEnvelopeAction::~TesselationConvexEnvelopeAction()
-{}
-
-void TesselationConvexEnvelope(std::string &filenameConvex, std::string &filenameNonConvex) {
-  ValueStorage::getInstance().setCurrentValue("convex-file", filenameConvex);
-  ValueStorage::getInstance().setCurrentValue("nonconvex-file", filenameConvex);
-  ActionRegistry::getInstance().getActionByName(TesselationConvexEnvelopeAction::NAME)->call(Action::NonInteractive);
-};
-
-void TesselationConvexEnvelopeAction::getParametersfromValueStorage()
-{};
-
-Dialog* TesselationConvexEnvelopeAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-
-  dialog->queryEmpty(NAME, ValueStorage::getInstance().getDescription(NAME));
-  dialog->queryString("convex-file", ValueStorage::getInstance().getDescription("convex-file"));
-  dialog->queryString("nonconvex-file", ValueStorage::getInstance().getDescription("nonconvex-file"));
-
-  return dialog;
-}
-
+// and construct the stuff
+#include "ConvexEnvelopeAction.def"
+#include "Action_impl_pre.hpp"
+/** =========== define the function ====================== */
 Action::state_ptr TesselationConvexEnvelopeAction::performCall() {
-  string filenameConvex;
-  string filenameNonConvex;
   molecule * mol = NULL;
   bool Success = true;
   config *configuration = World::getInstance().getConfig();
 
-  ValueStorage::getInstance().queryCurrentValue("convex-file", filenameConvex);
-  ValueStorage::getInstance().queryCurrentValue("nonconvex-file", filenameNonConvex);
+  // obtain information
+  getParametersfromValueStorage();
 
   for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
@@ -97 +53 @@
     const LinkedCell *LCList = NULL;
     DoLog(0) && (Log() << Verbose(0) << "Evaluating volume of the convex envelope.");
-    DoLog(1) && (Log() << Verbose(1) << "Storing tecplot convex data in " << filenameConvex << "." << endl);
-    DoLog(1) && (Log() << Verbose(1) << "Storing tecplot non-convex data in " << filenameNonConvex << "." << endl);
+    DoLog(1) && (Log() << Verbose(1) << "Storing tecplot convex data in " << params.filenameConvex << "." << endl);
+    DoLog(1) && (Log() << Verbose(1) << "Storing tecplot non-convex data in " << params.filenameNonConvex << "." << endl);
     LCList = new LinkedCell(mol, 100.);
     //Boundaries *BoundaryPoints = NULL;
     //FindConvexBorder(mol, BoundaryPoints, TesselStruct, LCList, argv[argptr]);
     // TODO: Beide Funktionen sollten streams anstelle des Filenamen benutzen, besser fuer unit tests
-    FindNonConvexBorder(mol, TesselStruct, LCList, 50., filenameNonConvex.c_str());
+    FindNonConvexBorder(mol, TesselStruct, LCList, 50., params.filenameNonConvex.c_str());
     //RemoveAllBoundaryPoints(TesselStruct, mol, argv[argptr]);
-    const double volumedifference = ConvexizeNonconvexEnvelope(TesselStruct, mol, filenameConvex.c_str());
+    const double volumedifference = ConvexizeNonconvexEnvelope(TesselStruct, mol, params.filenameConvex.c_str());
     const double clustervolume = VolumeOfConvexEnvelope(TesselStruct, configuration);
     DoLog(0) && (Log() << Verbose(0) << "The tesselated volume area is " << clustervolume << " " << (configuration->GetIsAngstroem() ? "angstrom" : "atomiclength") << "^3." << endl);
@@ -143 +99 @@
   return NAME;
 }
+/** =========== end of function ====================== */

src/Actions/TesselationAction/ConvexEnvelopeAction.hpp

@@ -11 +11 @@
 #include "Actions/Action.hpp"
 
-
-class TesselationListClass;
-
-void TesselationConvexEnvelope(std::string &filenameConvex, std::string &filenameNonConvex);
-
-class TesselationConvexEnvelopeAction : public Action {
-  friend void TesselationConvexEnvelope(std::string &filenameConvex, std::string &filenameNonConvex);
-
-public:
-  TesselationConvexEnvelopeAction();
-  virtual ~TesselationConvexEnvelopeAction();
-
-  bool canUndo();
-  bool shouldUndo();
-
-  virtual const std::string getName();
-protected:
-  virtual Dialog * fillDialog(Dialog *dialog);
-private:
-  virtual void getParametersfromValueStorage();
-  virtual Action::state_ptr performCall();
-  virtual Action::state_ptr performUndo(Action::state_ptr);
-  virtual Action::state_ptr performRedo(Action::state_ptr);
-
-  static const char NAME[];
-};
+#include "ConvexEnvelopeAction.def"
+#include "Action_impl_header.hpp"
 
 #endif // CONVEXENVELOPEACTION_HPP

src/Actions/TesselationAction/NonConvexEnvelopeAction.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include "Actions/TesselationAction/NonConvexEnvelopeAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "boundary.hpp"
 #include "linkedcell.hpp"
@@ -35 +33 @@
 using namespace std;
 
-#include "UIElements/UIFactory.hpp"
-#include "UIElements/Dialog.hpp"
-#include "Actions/ValueStorage.hpp"
+#include "Actions/TesselationAction/NonConvexEnvelopeAction.hpp"
 
-/****** TesselationNonConvexEnvelopeAction *****/
-
-// memento to remember the state when undoing
-
-//class TesselationNonConvexEnvelopeState : public ActionState {
-//public:
-//  TesselationNonConvexEnvelopeState(molecule* _mol,std::string _lastName) :
-//    mol(_mol),
-//    lastName(_lastName)
-//  {}
-//  molecule* mol;
-//  std::string lastName;
-//};
-
-const char TesselationNonConvexEnvelopeAction::NAME[] = "nonconvex-envelope";
-
-TesselationNonConvexEnvelopeAction::TesselationNonConvexEnvelopeAction() :
-  Action(NAME)
-{}
-
-TesselationNonConvexEnvelopeAction::~TesselationNonConvexEnvelopeAction()
-{}
-
-void TesselationNonConvexEnvelope(double radius, std::string &filename) {
-  ValueStorage::getInstance().setCurrentValue(TesselationNonConvexEnvelopeAction::NAME, radius);
-  ValueStorage::getInstance().setCurrentValue("nonconvex-file", filename);
-  ActionRegistry::getInstance().getActionByName(TesselationNonConvexEnvelopeAction::NAME)->call(Action::NonInteractive);
-};
-
-void TesselationNonConvexEnvelopeAction::getParametersfromValueStorage()
-{};
-
-Dialog* TesselationNonConvexEnvelopeAction::fillDialog(Dialog *dialog) {
-  ASSERT(dialog,"No Dialog given when filling action dialog");
-
-  dialog->queryDouble(NAME, ValueStorage::getInstance().getDescription(NAME));
-  dialog->queryString("nonconvex-file", ValueStorage::getInstance().getDescription("nonconvex-file"));
-
-  return dialog;
-}
-
+// and construct the stuff
+#include "NonConvexEnvelopeAction.def"
+#include "Action_impl_pre.hpp"
+/** =========== define the function ====================== */
 Action::state_ptr TesselationNonConvexEnvelopeAction::performCall() {
-  string filename;
   molecule * Boundary = NULL;
-  double SphereRadius = 0;
   bool Success = false;
   clock_t start,end;
 
-  ValueStorage::getInstance().queryCurrentValue(NAME, SphereRadius);
-  ValueStorage::getInstance().queryCurrentValue("nonconvex-file", filename);
+  // obtain information
+  getParametersfromValueStorage();
 
   for (World::MoleculeSelectionIterator iter = World::getInstance().beginMoleculeSelection(); iter != World::getInstance().endMoleculeSelection(); ++iter) {
@@ -95 +52 @@
     const LinkedCell *LCList = NULL;
     DoLog(0) && (Log() << Verbose(0) << "Evaluating non-convex envelope of molecule." << Boundary->getId() << endl);
-    DoLog(1) && (Log() << Verbose(1) << "Using rolling ball of radius " << SphereRadius << " and storing tecplot data in " << filename << "." << endl);
+    DoLog(1) && (Log() << Verbose(1) << "Using rolling ball of radius " << params.SphereRadius << " and storing tecplot data in " << params.filename << "." << endl);
     DoLog(1) && (Log() << Verbose(1) << "Specified molecule has " << Boundary->getAtomCount() << " atoms." << endl);
     start = clock();
-    LCList = new LinkedCell(Boundary, SphereRadius*2.);
-    Success = FindNonConvexBorder(Boundary, T, LCList, SphereRadius, filename.c_str());
-    //FindDistributionOfEllipsoids(T, &LCList, N, number, filename.c_str());
+    LCList = new LinkedCell(Boundary, params.SphereRadius*2.);
+    Success = FindNonConvexBorder(Boundary, T, LCList, params.SphereRadius, params.filename.c_str());
+    //FindDistributionOfEllipsoids(T, &LCList, N, number, params.filename.c_str());
     end = clock();
     DoLog(0) && (Log() << Verbose(0) << "Clocks for this operation: " << (end-start) << ", time: " << ((double)(end-start)/CLOCKS_PER_SEC) << "s." << endl);
@@ -137 +94 @@
   return NAME;
 }
+/** =========== end of function ====================== */

src/Actions/TesselationAction/NonConvexEnvelopeAction.hpp

@@ -11 +11 @@
 #include "Actions/Action.hpp"
 
-
-class TesselationListClass;
-
-void TesselationNonConvexEnvelope(double radius, std::string &filename);
-
-class TesselationNonConvexEnvelopeAction : public Action {
-  friend void TesselationNonConvexEnvelope(double radius, std::string &filename);
-
-public:
-  TesselationNonConvexEnvelopeAction();
-  virtual ~TesselationNonConvexEnvelopeAction();
-
-  bool canUndo();
-  bool shouldUndo();
-
-  virtual const std::string getName();
-protected:
-  virtual Dialog * fillDialog(Dialog *dialog);
-private:
-  virtual void getParametersfromValueStorage();
-  virtual Action::state_ptr performCall();
-  virtual Action::state_ptr performUndo(Action::state_ptr);
-  virtual Action::state_ptr performRedo(Action::state_ptr);
-
-  static const char NAME[];
-};
-
+#include "NonConvexEnvelopeAction.def"
+#include "Action_impl_header.hpp"
 
 #endif // NONCONVEXENVELOPEACTION_HPP