Changeset fdfc52


Ignore:
Timestamp:
May 7, 2016, 7:03:56 AM (9 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_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:
086e30
Parents:
fd5440
git-author:
Frederik Heber <heber@…> (02/28/16 12:57:48)
git-committer:
Frederik Heber <heber@…> (05/07/16 07:03:56)
Message:

Renamed all SerializablePotential..Exceptions to Serializer..Exceptions.

  • this makes it clearer that we also use them for particles and not only for potentials.
Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/PotentialAction/ParsePotentialsAction.cpp

    rfd5440 rfdfc52  
    6565        PotentialDeserializer deserialize(returnstream);
    6666        deserialize();
    67       } catch (SerializablePotentialMissingValueException &e) {
    68         if (const std::string *key = boost::get_error_info<SerializablePotentialKey>(e))
     67      } catch (SerializerMissingValueException &e) {
     68        if (const std::string *key = boost::get_error_info<SerializerKey>(e))
    6969          STATUS("Missing value when parsing information for potential "+*key+".");
    7070        else
    7171          STATUS("Missing value parsing information for potential with unknown key.");
    7272        return Action::failure;
    73       } catch (SerializablePotentialIllegalKeyException &e) {
    74         if (const std::string *key = boost::get_error_info<SerializablePotentialKey>(e))
     73      } catch (SerializerIllegalKeyException &e) {
     74        if (const std::string *key = boost::get_error_info<SerializerKey>(e))
    7575          STATUS("Illegal key parsing information for potential "+*key+".");
    7676        else
  • src/Potentials/Exceptions.hpp

    rfd5440 rfdfc52  
    1717#include <boost/exception/all.hpp>
    1818
    19 /** Base type for all exceptions regarding linear algebra.
     19/** type for all serializer exceptions on bad streams
    2020 *
    2121 */
    22 struct SerializablePotentialException : virtual std::exception, virtual boost::exception { };
     22struct SerializerStreamException : virtual std::exception, virtual boost::exception { };
    2323
    2424/** ========================== General error information ================== */
     
    2626/** Exception information for ParserException: non-present key of an internal map.
    2727 */
    28 typedef boost::error_info< struct tag_SerializablePotentialKey, const std::string > SerializablePotentialKey;
     28typedef boost::error_info< struct tag_SerializerKey, const std::string > SerializerKey;
    2929
    3030/** ============================ Specific exceptions ====================== */
     
    3232/** Exception thrown when the given parameter name/key does not exist
    3333 */
    34 struct SerializablePotentialIllegalKeyException : virtual SerializablePotentialException { };
     34struct SerializerIllegalKeyException : virtual SerializerStreamException { };
    3535
    3636/** Exception thrown when the value to parameter name/key is missing
    3737 */
    38 struct SerializablePotentialMissingValueException : virtual SerializablePotentialException { };
     38struct SerializerMissingValueException : virtual SerializerStreamException { };
    3939
    4040#endif /* EXCEPTIONS_HPP_ */
  • src/Potentials/Particles/Particle.cpp

    rfd5440 rfdfc52  
    119119  // check stream
    120120  if (ost.bad())
    121     throw SerializablePotentialException();
     121    throw SerializerStreamException();
    122122
    123123  /// print parameter key
     
    150150  // check stream
    151151  if (ist.bad())
    152     throw SerializablePotentialException();
     152    throw SerializerStreamException();
    153153
    154154  // read in full line
     
    160160  if ((strBegin == std::string::npos) || (colonpos == std::string::npos) ||
    161161      (linestring.substr(strBegin, colonpos-strBegin) != std::string("particle")))
    162     throw SerializablePotentialMissingValueException()
    163         << SerializablePotentialKey(std::string("particle"));
     162    throw SerializerMissingValueException()
     163        << SerializerKey(std::string("particle"));
    164164
    165165  // tokenize by ","
     
    180180
    181181    if (equalitypos == std::string::npos)
    182       throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
     182      throw SerializerMissingValueException() << SerializerKey(key);
    183183
    184184    switch((parameters_t)index) {
     
    211211      break;
    212212    default:
    213       throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
     213      throw SerializerMissingValueException() << SerializerKey(key);
    214214      break;
    215215    }
  • src/Potentials/SerializablePotential.cpp

    rfd5440 rfdfc52  
    6464  // check stream
    6565  if (ost.bad())
    66     throw SerializablePotentialException();
     66    throw SerializerStreamException();
    6767
    6868  /// print parameter key
     
    104104  // check stream
    105105  if (ist.bad())
    106     throw SerializablePotentialException();
     106    throw SerializerStreamException();
    107107
    108108  // create copy of current parameters as line may contain not all required
     
    117117  if ((strBegin == std::string::npos) || (colonpos == std::string::npos) ||
    118118      (linestring.substr(strBegin, colonpos-strBegin) != getToken()))
    119     throw SerializablePotentialMissingValueException()
    120         << SerializablePotentialKey(getName());
     119    throw SerializerMissingValueException()
     120        << SerializerKey(getName());
    121121
    122122  // tokenize by ","
     
    146146      const size_t index = ConvertToIndex(indexstring);
    147147      if(index == 0)
    148           throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
     148          throw SerializerMissingValueException() << SerializerKey(key);
    149149      // and set the type
    150150      if (equalitypos == std::string::npos)
    151         throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
     151        throw SerializerMissingValueException() << SerializerKey(key);
    152152      setParticleType(index-1, ConvertToParticleType(value));
    153153    } else {
     
    156156      if (index != (size_t)-1) {
    157157        if (equalitypos == std::string::npos)
    158           throw SerializablePotentialMissingValueException() << SerializablePotentialKey(key);
     158          throw SerializerMissingValueException() << SerializerKey(key);
    159159        params[index] = ConvertToValue(value);
    160160      } else {
    161         throw SerializablePotentialIllegalKeyException() << SerializablePotentialKey(key);
     161        throw SerializerIllegalKeyException() << SerializerKey(key);
    162162      }
    163163    }
  • src/Potentials/unittests/SerializablePotentialUnitTest.cpp

    rfd5440 rfdfc52  
    105105    CPPUNIT_ASSERT_THROW(
    106106        illegalkeystream >> mockpotential,
    107         SerializablePotentialIllegalKeyException);
     107        SerializerIllegalKeyException);
    108108    CPPUNIT_ASSERT_EQUAL(
    109109        SerializablePotential::parameter_t(1),
     
    116116    CPPUNIT_ASSERT_THROW(
    117117        missingvaluestream >> mockpotential,
    118         SerializablePotentialMissingValueException);
     118        SerializerMissingValueException);
    119119    CPPUNIT_ASSERT_EQUAL(
    120120        SerializablePotential::parameter_t(1),
Note: See TracChangeset for help on using the changeset viewer.