Changeset cfda65 for src

Timestamp:

Jul 15, 2010, 10:37:56 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:

4506cc

Parents:

ef84ca

Message:

Added methods to output shapes on the screen

Location:

src/Shapes

Files:

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

src/Shapes/BaseShapes.cpp

@@ -27 +27 @@
   }
   return point;
+}
+
+string Sphere_impl::toString(){
+  return "Sphere()";
 }
 
@@ -67 +71 @@
 }
 
+string Cuboid_impl::toString(){
+  return "Cuboid()";
+}
+
 Shape Cuboid(){
   Shape::impl_ptr impl = Shape::impl_ptr(new Cuboid_impl());

src/Shapes/BaseShapes_impl.hpp

@@ -15 +15 @@
   virtual bool isOnSurface(const Vector &point);
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
+  virtual std::string toString();
 };
 
@@ -21 +22 @@
   virtual bool isOnSurface(const Vector &point);
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
+  virtual std::string toString();
 };
 

src/Shapes/Shape.cpp

@@ -11 +11 @@
 #include "Helpers/Assert.hpp"
 
+#include <string>
+
+using namespace std;
+
 Shape::Shape(const Shape& src) :
   impl(src.getImpl())
@@ -38 +42 @@
   }
   return *this;
+}
+
+std::string Shape::toString() const{
+  return impl->toString();
 }
 
@@ -118 +126 @@
 }
 
+string AndShape_impl::toString(){
+  return string("(") + lhs->toString() + string("&&") + rhs->toString() + string(")");
+}
+
 Shape operator&&(const Shape &lhs,const Shape &rhs){
   Shape::impl_ptr newImpl = Shape::impl_ptr(new AndShape_impl(getShapeImpl(lhs),getShapeImpl(rhs)));
@@ -178 +190 @@
 }
 
+string OrShape_impl::toString(){
+  return string("(") + lhs->toString() + string("||") + rhs->toString() + string(")");
+}
+
 Shape operator||(const Shape &lhs,const Shape &rhs){
   Shape::impl_ptr newImpl = Shape::impl_ptr(new OrShape_impl(getShapeImpl(lhs),getShapeImpl(rhs)));
@@ -203 +219 @@
 }
 
+string NotShape_impl::toString(){
+  return string("!") + arg->toString();
+}
+
 Shape operator!(const Shape &arg){
   Shape::impl_ptr newImpl = Shape::impl_ptr(new NotShape_impl(getShapeImpl(arg)));
   return Shape(newImpl);
 }
+
+/**************** global operations *********************************/
+ostream &operator<<(ostream &ost,const Shape &shape){
+  ost << shape.toString();
+  return ost;
+}

src/Shapes/Shape.hpp

@@ -10 +10 @@
 
 #include <boost/shared_ptr.hpp>
+#include <iosfwd>
 
 #include "Exceptions/NotOnSurfaceException.hpp"
@@ -32 +33 @@
   Shape &operator=(const Shape& rhs);
 
+  std::string toString() const;
 protected:
   impl_ptr getImpl() const;
@@ -46 +48 @@
 Shape operator!(const Shape&);
 
+std::ostream &operator<<(std::ostream&,const Shape&);
+
 #endif /* SHAPE_HPP_ */

src/Shapes/ShapeOps.cpp

@@ -34 +34 @@
 }
 
+Shape::impl_ptr ShapeOpsBase_impl::getArg(){
+  return arg;
+}
+
 /********************* Resize ********************/
 
@@ -54 +58 @@
 Vector Resize_impl::translateOutNormal(const Vector& point){
   return point;
+}
+
+string Resize_impl::toString(){
+  stringstream sstr;
+  sstr << "resize(" << getArg()->toString() << "," << size << ")";
+  return sstr.str();
 }
 
@@ -79 +89 @@
 Vector Translate_impl::translateOutNormal(const Vector& point){
   return point;
+}
+
+string Translate_impl::toString(){
+  stringstream sstr;
+  sstr << "translate(" << getArg()->toString() << "," << offset << ")";
 }
 
@@ -125 +140 @@
 }
 
+string Stretch_impl::toString(){
+  stringstream sstr;
+  sstr << "stretch(" << getArg()->toString() << "," << factors << ")";
+  return sstr.str();
+}
+
 Shape stretch(const Shape &arg, const Vector &factors){
   Shape::impl_ptr impl = Shape::impl_ptr(new Stretch_impl(getShapeImpl(arg),factors));
@@ -153 +174 @@
 }
 
+string Transform_impl::toString(){
+  stringstream sstr;
+  sstr << "transform(" << getArg()->toString() << "," << transformation << ")";
+  return sstr.str();
+}
+
 Shape transform(const Shape &arg, const Matrix &transformation){
   Shape::impl_ptr impl = Shape::impl_ptr(new Transform_impl(getShapeImpl(arg),transformation));

src/Shapes/ShapeOps_impl.hpp

@@ -24 +24 @@
   virtual Vector translateOutPos(const Vector &point)=0;
   virtual Vector translateOutNormal(const Vector &point)=0;
+  Shape::impl_ptr getArg();
 private:
   Shape::impl_ptr arg;
@@ -37 +38 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
+  virtual std::string toString();
 private:
   double size;
@@ -50 +52 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
+  virtual std::string toString();
 private:
   Vector offset;
@@ -63 +66 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
+  virtual std::string toString();
 private:
   Vector factors;
@@ -77 +81 @@
   virtual Vector translateOutPos(const Vector &point);
   virtual Vector translateOutNormal(const Vector &point);
+  virtual std::string toString();
 private:
   Matrix transformation;

src/Shapes/Shape_impl.hpp

@@ -19 +19 @@
   virtual bool isOnSurface(const Vector &point)=0;
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException)=0;
+  virtual std::string toString()=0;
 };
 
@@ -32 +33 @@
     throw NotOnSurfaceException(__FILE__,__LINE__);
   }
+  virtual std::string toString(){
+    return "Everywhere()";
+  }
 };
 
@@ -44 +48 @@
     throw NotOnSurfaceException(__FILE__,__LINE__);
   }
+  virtual std::string toString(){
+    return "Nowhere()";
+  }
 };
 
@@ -53 +60 @@
   virtual bool isOnSurface(const Vector &point);
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
+  virtual std::string toString();
 private:
   Shape::impl_ptr lhs;
@@ -65 +73 @@
   virtual bool isOnSurface(const Vector &point);
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
+  virtual std::string toString();
 private:
   Shape::impl_ptr lhs;
@@ -77 +86 @@
   virtual bool isOnSurface(const Vector &point);
   virtual Vector getNormal(const Vector &point) throw(NotOnSurfaceException);
+  virtual std::string toString();
 private:
   Shape::impl_ptr arg;