Changeset b92e4a

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.

Location:

src/Shapes

Files:

• BaseShapes.cpp (modified) (2 diffs)
• BaseShapes_impl.hpp (modified) (3 diffs)
• Shape.cpp (modified) (5 diffs)
• Shape.hpp (modified) (3 diffs)
• ShapeOps.cpp (modified) (5 diffs)
• ShapeOps_impl.hpp (modified) (6 diffs)
• ShapeType.hpp (added)
• Shape_impl.hpp (modified) (7 diffs)

src/Shapes/BaseShapes.cpp

@@ -61 +61 @@
 }
 
-std::string Sphere_impl::toString(){
+std::string Sphere_impl::toString() const{
   return "Sphere()";
+}
+
+enum ShapeType Sphere_impl::getType() const
+{
+        return SphereType;
 }
 
@@ -192 +197 @@
 }
 
-std::string Cuboid_impl::toString(){
+std::string Cuboid_impl::toString() const{
   return "Cuboid()";
+}
+
+enum ShapeType Cuboid_impl::getType() const
+{
+        return CuboidType;
 }
 

src/Shapes/BaseShapes_impl.hpp

@@ -20 +20 @@
 #include "Shapes/Shape_impl.hpp"
 #include "Shapes/ShapeExceptions.hpp"
+#include "Shapes/ShapeType.hpp"
 
 class Sphere_impl : public Shape_impl {
@@ -26 +27 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
-  virtual std::string toString();
+  virtual std::string toString() const;
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 };
@@ -35 +37 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
-  virtual std::string toString();
+  virtual std::string toString() const;
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 };

src/Shapes/Shape.cpp

@@ -26 +26 @@
 #include "Shapes/Shape_impl.hpp"
 #include "Shapes/ShapeExceptions.hpp"
+#include "Shapes/ShapeType.hpp"
 
 #include <string>
@@ -67 +68 @@
 }
 
+bool Shape::operator==(const Shape &rhs) const{
+        return (this->getType() == rhs.getType());
+}
+
 std::string Shape::toString() const{
   return impl->toString();
+}
+
+enum ShapeType Shape::getType() const{
+        return impl->getType();
 }
 
@@ -153 +162 @@
 }
 
-std::string AndShape_impl::toString() {
+std::string AndShape_impl::toString() const{
   return std::string("(") + lhs->toString() + std::string("&&") + rhs->toString() + std::string(")");
+}
+
+enum ShapeType AndShape_impl::getType() const{
+        return CombinedType;
 }
 
@@ -239 +252 @@
 }
 
-std::string OrShape_impl::toString() {
+std::string OrShape_impl::toString() const{
   return std::string("(") + lhs->toString() + std::string("||") + rhs->toString() + std::string(")");
+}
+
+enum ShapeType OrShape_impl::getType() const{
+        return CombinedType;
 }
 
@@ -289 +306 @@
 }
 
-std::string NotShape_impl::toString(){
+std::string NotShape_impl::toString() const{
   return std::string("!") + arg->toString();
+}
+
+enum ShapeType NotShape_impl::getType() const{
+        return CombinedType;
 }
 

src/Shapes/Shape.hpp

@@ -19 +19 @@
 
 #include "Shapes/ShapeExceptions.hpp"
+#include "Shapes/ShapeType.hpp"
 
 #include <vector>
@@ -41 +42 @@
   Vector getNormal(const Vector &point) const throw(NotOnSurfaceException);
 
+  Vector getCenter() const;
+  Vector getRadius() const;
+
   LineSegmentSet getLineIntersections(const Line&);
   std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
@@ -46 +50 @@
   Shape &operator=(const Shape& rhs);
 
+  bool operator==(const Shape &rhs) const;
+
   std::string toString() const;
+  enum ShapeType getType() const;
+
 protected:
   impl_ptr getImpl() const;

src/Shapes/ShapeOps.cpp

@@ -71 +71 @@
 }
 
+enum ShapeType ShapeOpsBase_impl::getType() const {
+        return getArg()->getType();
+}
+
 std::vector<Vector> ShapeOpsBase_impl::getHomogeneousPointsOnSurface(const size_t N) const {
   return getArg()->getHomogeneousPointsOnSurface(N);;
@@ -105 +109 @@
 }
 
-std::string Resize_impl::toString() {
+std::string Resize_impl::toString() const{
   std::stringstream sstr;
   sstr << "resize(" << getArg()->toString() << "," << size << ")";
@@ -149 +153 @@
 }
 
-std::string Translate_impl::toString() {
+std::string Translate_impl::toString() const{
   std::stringstream sstr;
   sstr << "translate(" << getArg()->toString() << "," << offset << ")";
@@ -213 +217 @@
 }
 
-std::string Stretch_impl::toString() {
+std::string Stretch_impl::toString() const{
   std::stringstream sstr;
   sstr << "stretch(" << getArg()->toString() << "," << factors << ")";
@@ -259 +263 @@
 }
 
-std::string Transform_impl::toString() {
+std::string Transform_impl::toString() const{
   std::stringstream sstr;
   sstr << "transform(" << getArg()->toString() << "," << transformation << ")";

src/Shapes/ShapeOps_impl.hpp

@@ -17 +17 @@
 #include "Shapes/Shape_impl.hpp"
 #include "Shapes/ShapeExceptions.hpp"
+#include "Shapes/ShapeType.hpp"
 #include "LinearAlgebra/Vector.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
@@ -32 +33 @@
   virtual Vector getNormal(const Vector &point) throw (NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 protected:
@@ -51 +53 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual std::string toString() const;
   virtual bool isInside(const Vector& point);
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
@@ -67 +69 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual std::string toString() const;
   virtual bool isInside(const Vector& point);
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
@@ -83 +85 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual std::string toString() const;
   virtual bool isInside(const Vector& point);
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
@@ -100 +102 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
-  virtual std::string toString();
+  virtual std::string toString() const;
   virtual bool isInside(const Vector& point);
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;

src/Shapes/Shape_impl.hpp

@@ -19 +19 @@
 #include "Shapes/Shape.hpp"
 #include "Shapes/ShapeExceptions.hpp"
+#include "Shapes/ShapeType.hpp"
 #include "LinearAlgebra/Line.hpp"
 #include "LinearAlgebra/LineSegment.hpp"
@@ -33 +34 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException)=0;
   virtual LineSegmentSet getLineIntersections(const Line&)=0;
-  virtual std::string toString()=0;
+  virtual std::string toString() const =0;
+  virtual enum ShapeType getType() const =0;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const=0;
 };
@@ -53 +55 @@
     return res;
   }
-  virtual std::string toString(){
+  virtual std::string toString() const{
     return "Everywhere()";
+  }
+  virtual enum ShapeType getType() const {
+        return EverywhereType;
   }
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
@@ -75 +80 @@
     return LineSegmentSet(line);
   }
-  virtual std::string toString(){
+  virtual std::string toString() const{
     return "Nowhere()";
+  }
+  virtual enum ShapeType getType() const {
+        return NowhereType;
   }
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const {
@@ -92 +100 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
-  virtual std::string toString();
+  virtual std::string toString() const;
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 private:
@@ -107 +116 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
-  virtual std::string toString();
+  virtual std::string toString() const;
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 private:
@@ -122 +132 @@
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
   virtual LineSegmentSet getLineIntersections(const Line&);
-  virtual std::string toString();
+  virtual std::string toString() const;
+  virtual enum ShapeType getType() const;
   virtual std::vector<Vector> getHomogeneousPointsOnSurface(const size_t N) const;
 private: