Changeset e09b70

Timestamp:

Jun 18, 2010, 10:44:04 AM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

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:

394529

Parents:

e38447

Message:

Added basic operations on shapes

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• Shapes/Shape.cpp (modified) (4 diffs)
• Shapes/Shape.hpp (modified) (1 diff)
• Shapes/ShapeOps.cpp (added)
• Shapes/ShapeOps.hpp (added)
• Shapes/ShapeOps_impl.hpp (added)
• Shapes/Shape_impl.hpp (modified) (2 diffs)

src/Makefile.am

@@ -105 +105 @@
 SHAPESOURCE = \
   Shapes/BaseShapes.cpp \
-  Shapes/Shape.cpp
+  Shapes/Shape.cpp \
+  Shapes/ShapeOps.cpp
 SHAPEHEADER = \
   Shapes/BaseShapes.hpp \
-  Shapes/Shape.hpp
+  Shapes/Shape.hpp \
+  Shapes/ShapeOps.hpp
   
 

src/Shapes/Shape.cpp

@@ -34 +34 @@
 }
 
+// allows arbitrary friendship, but only if implementation is known
+Shape::impl_ptr getShapeImpl(const Shape &shape){
+  return shape.getImpl();
+}
+
 /***************************** Some simple Shapes ***************************/
 
@@ -61 +66 @@
 
 Shape operator&&(const Shape &lhs,const Shape &rhs){
-  Shape::impl_ptr newImpl = Shape::impl_ptr(new AndShape_impl(lhs.getImpl(),rhs.getImpl()));
+  Shape::impl_ptr newImpl = Shape::impl_ptr(new AndShape_impl(getShapeImpl(lhs),getShapeImpl(rhs)));
   return Shape(newImpl);
 }
@@ -78 +83 @@
 
 Shape operator||(const Shape &lhs,const Shape &rhs){
-  Shape::impl_ptr newImpl = Shape::impl_ptr(new OrShape_impl(lhs.getImpl(),rhs.getImpl()));
+  Shape::impl_ptr newImpl = Shape::impl_ptr(new OrShape_impl(getShapeImpl(lhs),getShapeImpl(rhs)));
   return Shape(newImpl);
 }
@@ -95 +100 @@
 
 Shape operator!(const Shape &arg){
-  Shape::impl_ptr newImpl = Shape::impl_ptr(new NotShape_impl(arg.getImpl()));
+  Shape::impl_ptr newImpl = Shape::impl_ptr(new NotShape_impl(getShapeImpl(arg)));
   return Shape(newImpl);
 }

src/Shapes/Shape.hpp

@@ -16 +16 @@
 class Shape
 {
-friend Shape operator&&(const Shape&,const Shape&);
-friend Shape operator||(const Shape&,const Shape&);
-friend Shape operator!(const Shape&);
 public:
   typedef boost::shared_ptr<Shape_impl> impl_ptr;
+  friend impl_ptr getShapeImpl(const Shape&);
 
   Shape(impl_ptr);

src/Shapes/Shape_impl.hpp

@@ -13 +13 @@
 class Shape_impl {
 public:
+  Shape_impl(){};
+  virtual ~Shape_impl(){};
   virtual bool isInside(const Vector &point)=0;
 };
@@ -58 +60 @@
 };
 
+Shape::impl_ptr getShapeImpl(const Shape&);
+
 #endif /* SHAPE_IMPL_HPP_ */