Changeset d5240d for src/UIElements/CommandLineUI

Timestamp:

Dec 4, 2010, 11:47:35 PM (14 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:

c82d0c

Parents:

ae21cbd

git-author:

Frederik Heber <heber@…> (11/11/10 14:39:10)

git-committer:

Frederik Heber <heber@…> (12/04/10 23:47:35)

Message:

FIX: Linking to non-system boost is working now.

• FIX: BOOST_CPPFLAGS was not present in AM_CPPFLAGS in all Makefile.am
• Hence, not the correct includes were used and linking occured with undefined reference errors (because of version conflict between system-wide installed and non-system boost)
• validate()s now make version check of boost as signature of validation_error)_ changed in boost 1.42
• added AX_BOOST_SYSTEM to configure.ac and BOOST_SYSTEM_LIB to src/Makefile.am and src/unittests/Makefile.am. Otherwise we have to set an rpath to let it find the lib needed by other boost libs in non-system boost configs.

File:

• src/UIElements/CommandLineUI/CommandLineParser_validate.cpp (modified) (6 diffs)

src/UIElements/CommandLineUI/CommandLineParser_validate.cpp

@@ -19 +19 @@
 
 #include "Helpers/MemDebug.hpp"
+
+#include <boost/version.hpp>
 
 #include <iostream>
@@ -41 +43 @@
   if (values.size() != 1) {
     std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
+#if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Unequal to one vector given");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("VectorValue")
+    );
+#endif
   }
   std::string argument(values.at(0));
@@ -59 +69 @@
   if (components.size() != 3) {
     std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;
+#if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Specified vector does not have three components");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("VectorValue")
+    );
+#endif
   }
   VV.x = boost::lexical_cast<double>(components.at(0));
@@ -75 +93 @@
   if (values.size() != 1) {
     std::cerr <<  "Not one vector but " << values.size() << " given " << std::endl;
+#if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Unequal to one vector given");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("BoxValue")
+    );
+#endif
   }
   std::string argument(values.at(0));
@@ -93 +119 @@
   if (components.size() != 6) {
     std::cerr <<  "Specified vector does not have three components but " << components.size() << std::endl;
+#if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Specified symmetric box matrix does not have six components");
+#else
+    throw boost::program_options::validation_error(
+        boost::program_options::validation_error::invalid_option_value,
+        std::string("value"),
+        std::string("BoxValue")
+    );
+#endif
   }
   BV.xx = boost::lexical_cast<double>(components.at(0));
@@ -120 +154 @@
   if (values.size() != 1) {
     std::cerr <<  "Not one file but " << values.size() << " given " << std::endl;
+#if BOOST_VERSION < 104200
     throw boost::program_options::validation_error("Unequal to one file given");
+#else
+    if (values.size() == 0) {
+      throw boost::program_options::validation_error(
+          boost::program_options::validation_error::at_least_one_value_required,
+          std::string("value"),
+          std::string("boost::filesystem::path")
+      );
+    } else {
+      throw boost::program_options::validation_error(
+          boost::program_options::validation_error::multiple_values_not_allowed,
+          std::string("value"),
+          std::string("boost::filesystem::path")
+      );
+    }
+#endif
   }
   filename = values.at(0);