Changeset 882678


Ignore:
Timestamp:
Apr 6, 2011, 1:50:42 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:
336e33
Parents:
b94634
git-author:
Frederik Heber <heber@…> (04/01/11 22:29:00)
git-committer:
Frederik Heber <heber@…> (04/06/11 13:50:42)
Message:

Removed IllegalTypeException from Exceptions.

Location:
src
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • src/Actions/ValueStorage.cpp

    rb94634 r882678  
    6868    CurrentValueMap.erase(name);
    6969  } else
    70     throw IllegalTypeException(__FILE__,__LINE__);
     70    throw IllegalTypeException() << ValueStorageOptionName(name)
     71        << ValueStoragePairTypeName(std::make_pair(
     72            typeid(_T).name(),
     73            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     74            );
    7175  _T = World::getInstance().getAtom(AtomById(atomID));
    7276}
    … …  
    8084    CurrentValueMap.erase(name);
    8185  } else
    82     throw IllegalTypeException(__FILE__,__LINE__);
     86    throw IllegalTypeException() << ValueStorageOptionName(name)
     87        << ValueStoragePairTypeName(std::make_pair(
     88            typeid(_T).name(),
     89            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     90            );
    8391  _T = World::getInstance().getPeriode()->FindElement(Z);
    8492}
    … …  
    92100    CurrentValueMap.erase(name);
    93101  } else
    94     throw IllegalTypeException(__FILE__,__LINE__);
     102    throw IllegalTypeException() << ValueStorageOptionName(name)
     103        << ValueStoragePairTypeName(std::make_pair(
     104            typeid(_T).name(),
     105            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     106            );
    95107  _T = World::getInstance().getMolecule(MoleculeById(molID));
    96108}
    … …  
    121133    CurrentValueMap.erase(name);
    122134  } else
    123     throw IllegalTypeException(__FILE__,__LINE__);
     135    throw IllegalTypeException() << ValueStorageOptionName(name)
     136        << ValueStoragePairTypeName(std::make_pair(
     137            typeid(_T).name(),
     138            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     139            );
    124140}
    125141
    … …  
    134150    }
    135151  } else
    136     throw IllegalTypeException(__FILE__,__LINE__);
     152    throw IllegalTypeException() << ValueStorageOptionName(name)
     153        << ValueStoragePairTypeName(std::make_pair(
     154            typeid(_T).name(),
     155            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     156            );
    137157}
    138158
    … …  
    147167    }
    148168  } else
    149     throw IllegalTypeException(__FILE__,__LINE__);
     169    throw IllegalTypeException() << ValueStorageOptionName(name)
     170        << ValueStoragePairTypeName(std::make_pair(
     171            typeid(_T).name(),
     172            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     173            );
    150174}
    151175
    … …  
    159183        "ValueStorage::queryCurrentValue() - RandomNumberDistribution_Parameters in value map has only no components!");
    160184  } else
    161     throw IllegalTypeException(__FILE__,__LINE__);
     185    throw IllegalTypeException() << ValueStorageOptionName(name)
     186        << ValueStoragePairTypeName(std::make_pair(
     187            typeid(_T).name(),
     188            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     189            );
    162190}
    163191
    … …  
    186214    }
    187215  } else
    188     throw IllegalTypeException(__FILE__,__LINE__);
     216    throw IllegalTypeException() << ValueStorageOptionName(name)
     217        << ValueStoragePairTypeName(std::make_pair(
     218            typeid(_T).name(),
     219            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     220            );
    189221}
    190222
    … …  
    212244    }
    213245  } else
    214     throw IllegalTypeException(__FILE__,__LINE__);
     246    throw IllegalTypeException() << ValueStorageOptionName(name)
     247        << ValueStoragePairTypeName(std::make_pair(
     248            typeid(_T).name(),
     249            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     250            );
    215251}
    216252
    … …  
    239275    }
    240276  } else
    241     throw IllegalTypeException(__FILE__,__LINE__);
     277    throw IllegalTypeException() << ValueStorageOptionName(name)
     278        << ValueStoragePairTypeName(std::make_pair(
     279            typeid(_T).name(),
     280            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     281            );
    242282}
    243283
    … …  
    255295    _T = tmp;
    256296  } else
    257     throw IllegalTypeException(__FILE__,__LINE__);
     297    throw IllegalTypeException() << ValueStorageOptionName(name)
     298        << ValueStoragePairTypeName(std::make_pair(
     299            typeid(_T).name(),
     300            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     301            );
    258302}
    259303
    … …  
    265309    CurrentValueMap[name] = stream.str();
    266310  } else
    267     throw IllegalTypeException(__FILE__,__LINE__);
     311    throw IllegalTypeException() << ValueStorageOptionName(name)
     312        << ValueStoragePairTypeName(std::make_pair(
     313            typeid(_T).name(),
     314            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     315            );
    268316}
    269317
    … …  
    275323    CurrentValueMap[name] = stream.str();
    276324  } else
    277     throw IllegalTypeException(__FILE__,__LINE__);
     325    throw IllegalTypeException() << ValueStorageOptionName(name)
     326        << ValueStoragePairTypeName(std::make_pair(
     327            typeid(_T).name(),
     328            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     329            );
    278330}
    279331
    … …  
    285337    CurrentValueMap[name] = stream.str();
    286338  } else
    287     throw IllegalTypeException(__FILE__,__LINE__);
     339    throw IllegalTypeException() << ValueStorageOptionName(name)
     340        << ValueStoragePairTypeName(std::make_pair(
     341            typeid(_T).name(),
     342            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     343            );
    288344}
    289345
    … …  
    301357    CurrentValueMap[name] = stream.str();
    302358  } else
    303     throw IllegalTypeException(__FILE__,__LINE__);
     359    throw IllegalTypeException() << ValueStorageOptionName(name)
     360        << ValueStoragePairTypeName(std::make_pair(
     361            typeid(_T).name(),
     362            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     363            );
    304364}
    305365
    … …  
    319379    CurrentValueMap[name] = stream.str();
    320380  } else
    321     throw IllegalTypeException(__FILE__,__LINE__);
     381    throw IllegalTypeException() << ValueStorageOptionName(name)
     382        << ValueStoragePairTypeName(std::make_pair(
     383            typeid(_T).name(),
     384            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     385            );
    322386}
    323387
    … …  
    330394    DoLog(0) && (Log() << Verbose(0) << "ValueStorage::setCurrentValue() for "+toString(name)+" to "+stream.str()+"." << std::endl);
    331395  } else
    332     throw IllegalTypeException(__FILE__,__LINE__);
     396    throw IllegalTypeException() << ValueStorageOptionName(name)
     397        << ValueStoragePairTypeName(std::make_pair(
     398            typeid(_T).name(),
     399            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     400            );
    333401}
    334402
    … …  
    342410    CurrentValueMap[name] = stream.str();
    343411  } else
    344     throw IllegalTypeException(__FILE__,__LINE__);
     412    throw IllegalTypeException() << ValueStorageOptionName(name)
     413        << ValueStoragePairTypeName(std::make_pair(
     414            typeid(_T).name(),
     415            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     416            );
    345417}
    346418
    … …  
    354426    CurrentValueMap[name] = stream.str();
    355427  } else
    356     throw IllegalTypeException(__FILE__,__LINE__);
     428    throw IllegalTypeException() << ValueStorageOptionName(name)
     429        << ValueStoragePairTypeName(std::make_pair(
     430            typeid(_T).name(),
     431            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     432            );
    357433}
    358434
    … …  
    366442    CurrentValueMap[name] = stream.str();
    367443  } else
    368     throw IllegalTypeException(__FILE__,__LINE__);
     444    throw IllegalTypeException() << ValueStorageOptionName(name)
     445        << ValueStoragePairTypeName(std::make_pair(
     446            typeid(_T).name(),
     447            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     448            );
    369449}
    370450
    … …  
    376456    CurrentValueMap[name] = stream.str();
    377457  } else
    378     throw IllegalTypeException(__FILE__,__LINE__);
     458    throw IllegalTypeException() << ValueStorageOptionName(name)
     459        << ValueStoragePairTypeName(std::make_pair(
     460            typeid(_T).name(),
     461            OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     462            );
    379463}
    380464

  • src/Actions/ValueStorage.hpp

    rb94634 r882678  
    2323#include <vector>
    2424#include <typeinfo>
     25#include <utility>
    2526
    2627#include "Actions/OptionTrait.hpp"
    2728#include "Actions/OptionRegistry.hpp"
    28 #include "Exceptions/IllegalTypeException.hpp"
    2929#include "Exceptions/MissingValueException.hpp"
    3030#include "CodePatterns/Assert.hpp"
    3131#include "CodePatterns/Singleton.hpp"
     32
     33#include <exception>
     34#include <boost/exception.hpp>
     35
     36class MatrixContent;
     37class Vector;
     38
     39/** Base type for all exceptions regarding ValueStorage class.
     40 *
     41 */
     42struct ValueStorageException : virtual std::exception, virtual boost::exception { };
     43
     44/** ========================== General error information ================== */
     45
     46/** Exception information for ValueStorageException: name of option.
     47 */
     48typedef boost::error_info<struct tag_ValueStorageOptionName, const char *> ValueStorageOptionName;
     49
     50/** Exception information for ValueStorageException: name of type.
     51 */
     52typedef boost::error_info<struct tag_ValueStorageTypeName, const char *> ValueStorageTypeName;
     53
     54/** Exception information for ValueStorageException: pair of names of two types.
     55 */
     56typedef boost::error_info<
     57    struct tag_ValueStorageTypeName,
     58    std::pair<const char *,const char *> > ValueStoragePairTypeName;
     59
     60/** ============================ Specific exceptions ====================== */
     61
     62/** Exception thrown when ValueStorage is given an illegal type for a specific option.
     63 */
     64struct IllegalTypeException : virtual ValueStorageException { };
    3265
    3366class MapOfActionsTest;
    … …  
    94127      CurrentValueMap.erase(name);
    95128    } else
    96       throw IllegalTypeException(__FILE__,__LINE__);
     129      throw IllegalTypeException() << ValueStorageOptionName(name)
     130          << ValueStoragePairTypeName(std::make_pair(
     131              typeid(_T).name(),
     132              OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     133              );
    97134  }
    98135  template<typename T> void queryCurrentValue(const char * name, std::vector<T> &_T)
    … …  
    111148      }
    112149    } else
    113       throw IllegalTypeException(__FILE__,__LINE__);
     150      throw IllegalTypeException() << ValueStorageOptionName(name)
     151          << ValueStoragePairTypeName(std::make_pair(
     152              typeid(_T).name(),
     153              OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     154              );
    114155  }
    115156
    … …  
    136177      CurrentValueMap[name] = stream.str();
    137178    } else
    138       throw IllegalTypeException(__FILE__,__LINE__);
    139   }
     179      throw IllegalTypeException() << ValueStorageOptionName(name)
     180          << ValueStoragePairTypeName(std::make_pair(
     181              typeid(_T).name(),
     182              OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     183              );
     184}
    140185  /** Sets a value in the storage.
    141186   * \param name key of value
    … …  
    152197      CurrentValueMap[name] = stream.str();
    153198    } else
    154       throw IllegalTypeException(__FILE__,__LINE__);
     199      throw IllegalTypeException() << ValueStorageOptionName(name)
     200          << ValueStoragePairTypeName(std::make_pair(
     201              typeid(_T).name(),
     202              OptionRegistry_instance.getOptionByName(name)->getTypeName().c_str())
     203              );
    155204  }
    156205

  • src/Exceptions/Makefile.am

    rb94634 r882678  
    99EXCEPTIONSOURCE = \
    1010  CustomException.cpp \
    11   IllegalTypeException.cpp \
    1211  MissingValueException.cpp
    1312       
    … …  
    1514EXCEPTIONHEADER = \
    1615  CustomException.hpp \
    17   IllegalTypeException.hpp \
    1816  MissingValueException.hpp
    1917

  • src/LinearAlgebra/Exceptions.hpp

    rb94634 r882678  
    2020class Vector;
    2121
     22/** Base type for all exceptions regarding linear algebra.
     23 *
     24 */
    2225struct LinearAlgebraException : virtual std::exception, virtual boost::exception { };
    2326
Note: See TracChangeset for help on using the changeset viewer.