Changeset 0275ad for src/UIElements

Timestamp:

Feb 3, 2011, 9:59:57 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:

9964ff, c14c78

Parents:

1ee3b8d

git-author:

Frederik Heber <heber@…> (01/07/11 00:15:49)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:59:57)

Message:

Final step in Random numbers is done ...

• requires CodePatterns 1.0.7.
• RandomNumberDistributionFactory and RandomNumberEngineFactory are now ManipulablePrototypeFactory's (and ...Engine and ..Distribution_Encapsulation are ManipulableClone's).
• new sets of manipulation parameters RandomNumberDistribution_Parameters and RandomNumberEngine_Parameters.
• added Query for RandomNumberDistribution_Parameters because GUI will need to change for specific parameters depending on selected distribution. ... actually, this happened accidentally and was an enormous amount of work ...
• added string parser for distribution parameters from CommandLine, TextUI and QtUI with boost::tokenizer.
• ValueStorage uses this parser for query and setting of CurrentValue.
• unit tests are working and are doing their job very well (found a bug with clone not using the distriubtion to clone's parameters).
• added PrototypeManipulationTest to engine and distribution factory unit test.
• regression tests with Undo/Redo are done.
• what's missing is an extension of the test of RandomNumberGeneratorFactory.

Location:

src/UIElements

Files:

• CommandLineUI/CommandLineDialog.cpp (modified) (1 diff)
• CommandLineUI/CommandLineDialog.hpp (modified) (2 diffs)
• CommandLineUI/CommandLineParser.cpp (modified) (1 diff)
• CommandLineUI/Query/CommandLineQuery.hpp (modified) (1 diff)
• CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp (added)
• CommandLineUI/TypeEnumContainer.cpp (modified) (2 diffs)
• CommandLineUI/TypeEnumContainer.hpp (modified) (1 diff)
• Dialog.cpp (modified) (1 diff)
• Dialog.hpp (modified) (4 diffs)
• Makefile.am (modified) (6 diffs)
• Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.cpp (added)
• Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp (added)
• Qt4/QtDialog.cpp (modified) (1 diff)
• Qt4/QtDialog.hpp (modified) (2 diffs)
• Qt4/Query/QtQuery.hpp (modified) (4 diffs)
• Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp (added)
• Query/RandomNumberDistribution_ParametersQuery.cpp (added)
• TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp (added)
• TextUI/Query/TextQuery.hpp (modified) (1 diff)
• TextUI/TextDialog.cpp (modified) (1 diff)
• TextUI/TextDialog.hpp (modified) (2 diffs)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -108 +108 @@
 }
 
+void CommandLineDialog::queryRandomNumberDistribution_Parameters(const char* title, string _description){
+  registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(title, _description));
+}
+
 /************************** Query Infrastructure ************************/
 /*       ---> shifted to folder Query                                   */

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -51 +51 @@
   virtual void queryElements(const char*, std::string = "");
   virtual void queryFile(const char*, std::string = "");
-
+  virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "");
 protected:
-  // specialized stuff for text queries
+  // specialized stuff for command line queries
+  // all placed into Query/CommandLineQuery.hpp
+  // !please adhere to alphabetical ordering!
   class AtomCommandLineQuery;
   class AtomsCommandLineQuery;
@@ -72 +74 @@
   class VectorCommandLineQuery;
   class VectorsCommandLineQuery;
+  class RandomNumberDistribution_ParametersCommandLineQuery;
 };
 

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -326 +326 @@
         ;
       break;
+    case TypeEnumContainer::RandomNumberDistribution_ParametersType:
+      OptionList->add_options()
+        (currentOption->getKeyAndShortForm().c_str(),
+            currentOption->hasDefaultValue() ?
+                  po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
+                  po::value < std::string >(),
+                  currentOption->getDescription().c_str())
+        ;
+      break;
   }
 }

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -143 +143 @@
 };
 
+class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+public:
+  RandomNumberDistribution_ParametersCommandLineQuery(std::string title, std::string _description = "");
+  virtual ~RandomNumberDistribution_ParametersCommandLineQuery();
+  virtual bool handle();
+};
+
 #endif /* COMMANDLINEQUERY_HPP_ */

src/UIElements/CommandLineUI/TypeEnumContainer.cpp

@@ -36 +36 @@
 #include "element.hpp"
 #include "molecule.hpp"
+#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
 
 /** Constructor for class TypeEnumContainer.
@@ -63 +64 @@
   TypeEnumMap[&typeid(const element *)] = ElementType;
   TypeEnumMap[&typeid(std::vector<const element *>)] = ListOfElementsType;
+  TypeEnumMap[&typeid(RandomNumberDistribution_Parameters)] = RandomNumberDistribution_ParametersType;
 
   // for debugging: list all stored types

src/UIElements/CommandLineUI/TypeEnumContainer.hpp

@@ -44 +44 @@
         ListOfMoleculesType,
         ElementType,
-        ListOfElementsType
+        ListOfElementsType,
+        RandomNumberDistribution_ParametersType
   };
 

src/UIElements/Dialog.cpp

@@ -186 +186 @@
 }
 
+template <> void Dialog::query< RandomNumberDistribution_Parameters >(const char *token, std::string description)
+{
+  queryRandomNumberDistribution_Parameters(token, description);
+}
+
 /************************** Query Infrastructure ************************/
 /*       ---> shifted to folder Query                                   */

src/UIElements/Dialog.hpp

@@ -20 +20 @@
 
 #include <boost/filesystem.hpp>
-
 #include "Box.hpp"
 #include "LinearAlgebra/Vector.hpp"
+#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
 
 class atom;
@@ -142 +142 @@
  *   -# you probably also need a QtDialog::...QueryPipe() to handle the signal/slot stuff,
  *      Qt's moc does not like nested classes. Hence, this has to go extra.
+ *   -# TypeEnumContainer add new type to query
+ *   -# CommandLineParser::AddOptionToParser() add new type to query
+ *   -# CommandLineParser_valdiates.[ch]pp: If given above as a new type
+ *      program_options::value, define and implement a validate() function here.
  *
  */
@@ -170 +174 @@
   virtual void queryElements(const char*, std::string = "")=0;
   virtual void queryFile(const char*, std::string = "")=0;
+  virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "")=0;
 
   virtual bool display();
@@ -419 +424 @@
   };
 
+  class RandomNumberDistribution_ParametersQuery : public Query {
+  public:
+    RandomNumberDistribution_ParametersQuery(std::string title, std::string _description = "");
+    virtual ~RandomNumberDistribution_ParametersQuery();
+    virtual bool handle()=0;
+    virtual void setResult();
+  protected:
+    RandomNumberDistribution_Parameters tmp;
+  };
+
 void registerQuery(Query* query);
 

src/UIElements/Makefile.am

@@ -67 +67 @@
   Query/MoleculesQuery.cpp \
   Query/Query.cpp \
+  Query/RandomNumberDistribution_ParametersQuery.cpp \
   Query/StringQuery.cpp \
   Query/StringsQuery.cpp \
@@ -103 +104 @@
   TextUI/Query/VectorTextQuery.cpp \
   TextUI/Query/VectorsTextQuery.cpp \
+  TextUI/Query/RandomNumberDistribution_ParametersTextQuery.cpp \
   TextUI/TextDialog.cpp \
   TextUI/TextStatusIndicator.cpp \
@@ -133 +135 @@
   CommandLineUI/Query/VectorCommandLineQuery.cpp \
   CommandLineUI/Query/VectorsCommandLineQuery.cpp \
+  CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp \
   CommandLineUI/CommandLineDialog.cpp \
   CommandLineUI/CommandLineParser.cpp \
@@ -169 +172 @@
   Qt4/Pipe/VectorQtQueryPipe.hpp \
   Qt4/Pipe/VectorsQtQueryPipe.hpp \
+        Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.hpp \
         Menu/Qt4/QtMenuPipe.hpp \
         Views/Qt4/QtWorldView.hpp \
@@ -191 +195 @@
   Qt4/Pipe/VectorQtQueryPipe.cpp \
   Qt4/Pipe/VectorsQtQueryPipe.cpp \
+        Qt4/Pipe/RandomNumberDistribution_ParametersQtQueryPipe.cpp \
   Qt4/Query/AtomQtQuery.cpp \
   Qt4/Query/AtomsQtQuery.cpp \
@@ -209 +214 @@
   Qt4/Query/VectorQtQuery.cpp \
   Qt4/Query/VectorsQtQuery.cpp \
+        Qt4/Query/RandomNumberDistribution_ParametersQtQuery.cpp \
         Qt4/QtMainWindow.cpp \
         Qt4/QtDialog.cpp \

src/UIElements/Qt4/QtDialog.cpp

@@ -165 +165 @@
 }
 
+void QtDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string)
+{
+  registerQuery(new RandomNumberDistribution_ParametersQtQuery(title,inputLayout,this));
+}
+
 /************************** Query Infrastructure ************************/
 /*       ---> shifted to folder Query                                   */

src/UIElements/Qt4/QtDialog.hpp

@@ -50 +50 @@
   virtual void queryElements(const char*,std::string = "");
   virtual void queryFile(const char*,std::string = "");
+  virtual void queryRandomNumberDistribution_Parameters(const char*,std::string = "");
 
   virtual bool display();
@@ -74 +75 @@
   class VectorQtQuery;
   class VectorsQtQuery;
+  class RandomNumberDistribution_ParametersQtQuery;
 
 private:

src/UIElements/Qt4/Query/QtQuery.hpp

@@ -17 +17 @@
 #include "Qt4/QtDialog.hpp"
 
+class QHBoxLayout;
 class QBoxLayout;
 class QDialogButtonBox;
@@ -24 +25 @@
 class QLineEdit;
 class QListWidget;
+class QPushButton;
 class QTableWidget;
+class QTextEdit;
 class QComboBox;
 
@@ -46 +49 @@
 class VectorQtQueryPipe;
 class VectorsQtQueryPipe;
-
+class RandomNumberDistribution_ParametersQtQueryPipe;
 
 class QtDialog::AtomQtQuery : public Dialog::AtomQuery {
@@ -310 +313 @@
 };
 
+class QtDialog::RandomNumberDistribution_ParametersQtQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+public:
+  RandomNumberDistribution_ParametersQtQuery(std::string title,QBoxLayout *,QtDialog *);
+  virtual ~RandomNumberDistribution_ParametersQtQuery();
+  virtual bool handle();
+private:
+  QBoxLayout *parent;
+  QHBoxLayout *thisLayout;
+  QLabel *titleLabel;
+  QTextEdit *inputBox;
+  QPushButton *okButton;
+
+  RandomNumberDistribution_ParametersQtQueryPipe *pipe;
+};
+
 #endif /* QTQUERY_HPP_ */

src/UIElements/TextUI/Query/TextQuery.hpp

@@ -143 +143 @@
 };
 
+class TextDialog::RandomNumberDistribution_ParametersTextQuery : public Dialog::RandomNumberDistribution_ParametersQuery {
+public:
+  RandomNumberDistribution_ParametersTextQuery(std::string title, std::string _description = NULL);
+  virtual ~RandomNumberDistribution_ParametersTextQuery();
+  virtual bool handle();
+};
+
 #endif /* TEXTQUERY_HPP_ */

src/UIElements/TextUI/TextDialog.cpp

@@ -106 +106 @@
 }
 
+void TextDialog::queryRandomNumberDistribution_Parameters(const char* title, std::string description){
+  registerQuery(new RandomNumberDistribution_ParametersTextQuery(title,description));
+}
+
 /************************** Query Infrastructure ************************/
 /*       ---> shifted to folder Query                                   */

src/UIElements/TextUI/TextDialog.hpp

@@ -48 +48 @@
   virtual void queryElements(const char*, std::string = "");
   virtual void queryFile(const char*, std::string = "");
+  virtual void queryRandomNumberDistribution_Parameters(const char*, std::string = "");
 
 protected:
@@ -71 +72 @@
   class VectorTextQuery;
   class VectorsTextQuery;
+  class RandomNumberDistribution_ParametersTextQuery;
 };