Changeset b94634 for src/Shapes


Ignore:
Timestamp:
Apr 6, 2011, 1:50:41 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:
882678
Parents:
b88fe4
git-author:
Frederik Heber <heber@…> (04/01/11 22:08:13)
git-committer:
Frederik Heber <heber@…> (04/06/11 13:50:41)
Message:

Removed NotOnSurfaceException and ShapeException from Exceptions.

Location:
src/Shapes
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • src/Shapes/BaseShapes.cpp

    rb88fe4 rb94634  
    2222#include "Shapes/BaseShapes.hpp"
    2323#include "Shapes/BaseShapes_impl.hpp"
     24#include "Shapes/ShapeExceptions.hpp"
    2425#include "Shapes/ShapeOps.hpp"
    2526
    … …  
    4647Vector Sphere_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
    4748  if(!isOnSurface(point)){
    48     throw NotOnSurfaceException(__FILE__,__LINE__);
     49    throw NotOnSurfaceException() << ShapeVector(&point);
    4950  }
    5051  return point;
    … …  
    122123Vector Cuboid_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
    123124  if(!isOnSurface(point)){
    124     throw NotOnSurfaceException(__FILE__,__LINE__);
     125    throw NotOnSurfaceException() << ShapeVector(&point);
    125126  }
    126127  Vector res;

  • src/Shapes/BaseShapes_impl.hpp

    rb88fe4 rb94634  
    1919
    2020#include "Shapes/Shape_impl.hpp"
     21#include "Shapes/ShapeExceptions.hpp"
    2122
    2223class Sphere_impl : public Shape_impl {

  • src/Shapes/Shape.cpp

    rb88fe4 rb94634  
    2323#include "LinearAlgebra/Vector.hpp"
    2424
    25 #include "Shape.hpp"
    26 #include "Shape_impl.hpp"
     25#include "Shapes/Shape.hpp"
     26#include "Shapes/Shape_impl.hpp"
     27#include "Shapes/ShapeExceptions.hpp"
    2728
    2829#include <string>
    … …  
    140141  Vector res;
    141142  if(!isOnSurface(point)){
    142     throw NotOnSurfaceException(__FILE__,__LINE__);
     143    throw NotOnSurfaceException() << ShapeVector(&point);
    143144  }
    144145  res += lhs->isOnSurface(point)?lhs->getNormal(point):zeroVec;
    … …  
    226227  Vector res;
    227228  if(!isOnSurface(point)){
    228     throw NotOnSurfaceException(__FILE__,__LINE__);
     229    throw NotOnSurfaceException() << ShapeVector(&point);
    229230  }
    230231  res += lhs->isOnSurface(point)?lhs->getNormal(point):zeroVec;
    … …  
    281282
    282283Vector NotShape_impl::getNormal(const Vector &point) throw(NotOnSurfaceException){
    283   return -1*arg->getNormal(point);
     284  return -1.*arg->getNormal(point);
    284285}
    285286

  • src/Shapes/Shape.hpp

    rb88fe4 rb94634  
    1818#include <iosfwd>
    1919
    20 #include "Exceptions/NotOnSurfaceException.hpp"
     20#include "Shapes/ShapeExceptions.hpp"
    2121
    2222#include <vector>

  • src/Shapes/ShapeOps.cpp

    rb88fe4 rb94634  
    2020#include "CodePatterns/MemDebug.hpp"
    2121
     22#include "Shapes/ShapeExceptions.hpp"
    2223#include "Shapes/ShapeOps.hpp"
    2324#include "Shapes/ShapeOps_impl.hpp"
    … …  
    4445  Vector helper = translateIn(point);
    4546  if(!arg->isOnSurface(helper)){
    46     throw NotOnSurfaceException(__FILE__,__LINE__);
     47    throw NotOnSurfaceException() << ShapeVector(&helper);
    4748  }
    4849  Vector res = translateOutNormal(arg->getNormal(helper));

  • src/Shapes/ShapeOps_impl.hpp

    rb88fe4 rb94634  
    1616
    1717#include "Shapes/Shape_impl.hpp"
     18#include "Shapes/ShapeExceptions.hpp"
    1819#include "LinearAlgebra/Vector.hpp"
    1920#include "LinearAlgebra/RealSpaceMatrix.hpp"

  • src/Shapes/Shape_impl.hpp

    rb88fe4 rb94634  
    1818
    1919#include "Shapes/Shape.hpp"
     20#include "Shapes/ShapeExceptions.hpp"
    2021#include "LinearAlgebra/Line.hpp"
    2122#include "LinearAlgebra/LineSegment.hpp"
    … …  
    4546  }
    4647  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
    47     throw NotOnSurfaceException(__FILE__,__LINE__);
     48    throw NotOnSurfaceException() << ShapeVector(&point);
    4849  }
    4950  virtual LineSegmentSet getLineIntersections(const Line &line){
    … …  
    6970  }
    7071  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException){
    71     throw NotOnSurfaceException(__FILE__,__LINE__);
     72    throw NotOnSurfaceException() << ShapeVector(&point);
    7273  }
    7374  virtual LineSegmentSet getLineIntersections(const Line &line){
Note: See TracChangeset for help on using the changeset viewer.