Ignore:
Timestamp:
Mar 28, 2012, 3:17:38 PM (13 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:
735940
Parents:
6a7fcbb
git-author:
Frederik Heber <heber@…> (01/18/12 00:21:51)
git-committer:
Frederik Heber <heber@…> (03/28/12 15:17:38)
Message:

Shape identify themselves via an enumerated Type.

  • this is required lateron for preparing Mesh class out of a given Shape.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Shapes/Shape_impl.hpp

    r6a7fcbb rb92e4a  
    1919#include "Shapes/Shape.hpp"
    2020#include "Shapes/ShapeExceptions.hpp"
     21#include "Shapes/ShapeType.hpp"
    2122#include "LinearAlgebra/Line.hpp"
    2223#include "LinearAlgebra/LineSegment.hpp"
    … …  
    3334  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException)=0;
    3435  virtual LineSegmentSet getLineIntersections(const Line&)=0;
    35   virtual std::string toString()=0;
     36  virtual std::string toString() const =0;
     37  virtual enum ShapeType getType() const =0;
    3638  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const=0;
    3739};
    … …  
    5355    return res;
    5456  }
    55   virtual std::string toString(){
     57  virtual std::string toString() const{
    5658    return "Everywhere()";
     59  }
     60  virtual enum ShapeType getType() const {
     61        return EverywhereType;
    5762  }
    5863  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
    … …  
    7580    return LineSegmentSet(line);
    7681  }
    77   virtual std::string toString(){
     82  virtual std::string toString() const{
    7883    return "Nowhere()";
     84  }
     85  virtual enum ShapeType getType() const {
     86        return NowhereType;
    7987  }
    8088  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
    … …  
    92100  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    93101  virtual LineSegmentSet getLineIntersections(const Line&);
    94   virtual std::string toString();
     102  virtual std::string toString() const;
     103  virtual enum ShapeType getType() const;
    95104  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    96105private:
    … …  
    107116  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    108117  virtual LineSegmentSet getLineIntersections(const Line&);
    109   virtual std::string toString();
     118  virtual std::string toString() const;
     119  virtual enum ShapeType getType() const;
    110120  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    111121private:
    … …  
    122132  virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
    123133  virtual LineSegmentSet getLineIntersections(const Line&);
    124   virtual std::string toString();
     134  virtual std::string toString() const;
     135  virtual enum ShapeType getType() const;
    125136  virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
    126137private:
Note: See TracChangeset for help on using the changeset viewer.