Changeset 3a4be0 for src/UIElements/CommandLineUI

Timestamp:

May 17, 2015, 12:06:12 PM (10 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:

3054689

Parents:

2cf12a

git-author:

Frederik Heber <heber@…> (05/17/15 07:02:25)

git-committer:

Frederik Heber <heber@…> (05/17/15 12:06:12)

Message:

FIX: Removed specific queries for RandomNumberDistribution_Parameters.

• also removed RandomNumberDistribution_ParametersType from TypeEnumContainer.

Location:

src/UIElements/CommandLineUI

Files:

• CommandLineDialog.cpp (modified) (1 diff)
• CommandLineDialog.hpp (modified) (2 diffs)
• CommandLineParser.cpp (modified) (1 diff)
• Query/CommandLineQuery.hpp (modified) (1 diff)
• Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp (deleted)
• TypeEnumContainer.cpp (modified) (1 diff)
• TypeEnumContainer.hpp (modified) (1 diff)

src/UIElements/CommandLineUI/CommandLineDialog.cpp

@@ -136 +136 @@
 }
 
-void CommandLineDialog::queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &param, const std::string title, const std::string description){
-  registerQuery(new RandomNumberDistribution_ParametersCommandLineQuery(param, title, description));
-}
-
 /************************** Query Infrastructure ************************/
 /*       ---> shifted to folder Query                                   */

src/UIElements/CommandLineUI/CommandLineDialog.hpp

@@ -54 +54 @@
   virtual void queryFile(Parameter<boost::filesystem::path> &, const std::string ="", const std::string = "");
   virtual void queryFiles(Parameter<std::vector< boost::filesystem::path> > &, const std::string ="", const std::string = "");
-  virtual void queryRandomNumberDistribution_Parameters(Parameter<RandomNumberDistribution_Parameters> &, const std::string ="", const std::string = "");
   // specialized stuff for command line queries
   // all placed into Query/CommandLineQuery.hpp
@@ -79 +78 @@
   class VectorCommandLineQuery;
   class VectorsCommandLineQuery;
-  class RandomNumberDistribution_ParametersCommandLineQuery;
 };
 

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -399 +399 @@
 //                  po::value < std::vector<const element *> >()->default_value(boost::lexical_cast< std::vector<const element *> >(currentOption->getDefaultValue().c_str())) :
                   po::value < std::vector<int> >()->multitoken(),
-                  currentOption->getDescription().c_str())
-        ;
-      break;
-    case TypeEnumContainer::RandomNumberDistribution_ParametersType:
-      OptionList->add_options()
-        (currentOption->getKeyAndShortForm().c_str(),
-            currentOption->hasDefaultValue() ?
-                  (_DefaultAsImplicit ? 
-                      po::value < std::string >()->implicit_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
-                      po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str()))) :
-                  po::value < std::string >(),
                   currentOption->getDescription().c_str())
         ;

src/UIElements/CommandLineUI/Query/CommandLineQuery.hpp

@@ -164 +164 @@
 };
 
-class CommandLineDialog::RandomNumberDistribution_ParametersCommandLineQuery : public Dialog::TQuery<RandomNumberDistribution_Parameters> {
-public:
-  RandomNumberDistribution_ParametersCommandLineQuery(Parameter<RandomNumberDistribution_Parameters> &_param, const std::string &_title, const std::string &_description = "");
-  virtual ~RandomNumberDistribution_ParametersCommandLineQuery();
-  virtual bool handle();
-};
-
 #endif /* COMMANDLINEQUERY_HPP_ */

src/UIElements/CommandLineUI/TypeEnumContainer.cpp

@@ -81 +81 @@
   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

@@ -46 +46 @@
         ElementType,
         ListOfElementsType,
-        RandomNumberDistribution_ParametersType,
         RealSpaceMatrixType
   };