Changeset 1c9588 for src

Timestamp:

Nov 15, 2012, 5:31:08 PM (12 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:

6131d8

Parents:

8f6a27

git-author:

Michael Ankele <ankele@…> (09/14/12 12:31:31)

git-committer:

Frederik Heber <heber@…> (11/15/12 17:31:08)

Message:

Refactoring: ShapeFactory now uses global ShapeType

Location:

src/Shapes

Files:

• Shape.hpp (modified) (2 diffs)
• ShapeFactory.cpp (modified) (3 diffs)
• ShapeFactory.hpp (modified) (1 diff)
• ShapeRegistry.cpp (modified) (3 diffs)
• ShapeRegistry.hpp (modified) (1 diff)
• ShapeType.hpp (modified) (1 diff)
• unittests/ShapeFactoryUnitTest.cpp (modified) (5 diffs)

src/Shapes/Shape.hpp

@@ -27 +27 @@
 class LineSegmentSet;
 class Line;
-class ShapeFactoryTest;
 
 class Shape
@@ -34 +33 @@
   typedef boost::shared_ptr<Shape_impl> impl_ptr;
   friend impl_ptr getShapeImpl(const Shape&);
-  friend class ShapeFactoryTest;
 
   Shape(impl_ptr);

src/Shapes/ShapeFactory.cpp

@@ -44 +44 @@
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 
-const char *ShapeFactory::shapeNames[ShapeFactory::SHAPETYPES_MAX] = {"nowhere", "everywhere", "sphere", "cube", "cylinder"};
+const char *ShapeFactory::shapeNames[MAX_ShapeType] = {"nowhere", "everywhere", "sphere", "cube", "polygon", "combined", "cylinder"};
 
 ShapeFactory::ShapeFactory()
 {
   // Create map (type -> name).
-  for (int i=0; i<SHAPETYPES_MAX; i++)
+  for (int i=0; i<MAX_ShapeType; i++)
     shapeNameMap.insert(std::pair<ShapeType, std::string>((ShapeType)i, shapeNames[i]));
 
   // Create inverse map.
-  for (int i=0; i<SHAPETYPES_MAX; i++)
+  for (int i=0; i<MAX_ShapeType; i++)
     nameShapeMap.insert(std::pair<std::string, ShapeType>(shapeNames[i], (ShapeType)i));
 
   // Init state.
-  type = SPHERE;
+  type = SphereType;
   translation.Zero();
   stretch = Vector(1.,1.,1.);
@@ -64 +64 @@
 }
 
-ShapeFactory::ShapeType ShapeFactory::getShapeByName(const std::string& name)
+ShapeType ShapeFactory::getShapeByName(const std::string& name)
 {
   NameShapeMap::iterator iter = nameShapeMap.find(name);
@@ -112 +112 @@
   // Create the basic shape.
   Shape s = Nowhere();
-  if (type == NOWHERE){
+  if (type == NowhereType){
     s = Nowhere();
-  }else if (type == EVERYWHERE){
+  }else if (type == EverywhereType){
     s = Everywhere();
-  }else if (type == CUBE){
+  }else if (type == CuboidType){
     s = Cuboid();
-  }else if (type == SPHERE){
+  }else if (type == SphereType){
     s = Sphere();
-  }else if (type == CYLINDER){
+  }else if (type == CylinderType){
     s = Cylinder();
   }else{

src/Shapes/ShapeFactory.hpp

@@ -25 +25 @@
 
 public:
-  enum ShapeType{
-    NOWHERE, EVERYWHERE, SPHERE, CUBE, CYLINDER, SHAPETYPES_MAX
-  };
 
   ShapeType getShapeByName(const std::string &name);

src/Shapes/ShapeRegistry.cpp

@@ -41 +41 @@
 #include "CodePatterns/Observer/Channels.hpp"
 
+#include "ShapeFactory.hpp"
+
 ShapeRegistry::ShapeRegistry() :
   Observable::Observable("ShapeRegistry")
@@ -56 +58 @@
 }
 
+std::string ShapeRegistry::getDefaultNameForShape(Shape s) const
+{
+  std::string baseName = ShapeFactory::getInstance().getShapeName(s.getType());
+  int n = 1;
+  while(true){
+    std::string name = baseName + toString(n);
+    if (!isPresentByName(name))
+      return name;
+    n ++;
+  }
+  return "";
+}
+
 void ShapeRegistry::addShape(Shape s)
 {
@@ -64 +79 @@
 }
 
+void ShapeRegistry::removeShape(const std::string &name)
+{
+  OBSERVE;
+  Shape *instance = getByName(name);
+  unregisterInstance(instance);
+  delete(instance);
+  NOTIFY(ShapeRemoved);
+}
+
 CONSTRUCT_SINGLETON(ShapeRegistry)
 CONSTRUCT_REGISTRY(Shape)

src/Shapes/ShapeRegistry.hpp

@@ -27 +27 @@
 public:
   void addShape(Shape s);
+  void removeShape(const std::string &name);
   Shape* getShapeByName(const std::string name);
   bool isShapePresentByName(const std::string name) const;
+  std::string getDefaultNameForShape(Shape s) const;
 
   enum NotificationType {

src/Shapes/ShapeType.hpp

@@ -22 +22 @@
         PolygonType,
         CombinedType,
-        MAX_ShapeType,
-    CylinderType
+  CylinderType,
+        MAX_ShapeType
 };
 

src/Shapes/unittests/ShapeFactoryUnitTest.cpp

@@ -75 +75 @@
   ShapeFactory::getInstance().setTranslation(Vector(0., 0., 0.));
 
-  ShapeFactory::getInstance().setType(ShapeFactory::NOWHERE);
-  CPPUNIT_ASSERT( dynamic_cast<Nowhere_impl*>(ShapeFactory::getInstance().produce().getImpl().get()) );
+  ShapeFactory::getInstance().setType(NowhereType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().produce().getType(), NowhereType );
 
-  ShapeFactory::getInstance().setType(ShapeFactory::EVERYWHERE);
-  CPPUNIT_ASSERT( dynamic_cast<Everywhere_impl*>(ShapeFactory::getInstance().produce().getImpl().get()) );
+  ShapeFactory::getInstance().setType(EverywhereType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().produce().getType(), EverywhereType );
 
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
-  CPPUNIT_ASSERT( dynamic_cast<Sphere_impl*>(ShapeFactory::getInstance().produce().getImpl().get()) );
+  ShapeFactory::getInstance().setType(SphereType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().produce().getType(), SphereType );
 
-  ShapeFactory::getInstance().setType(ShapeFactory::CUBE);
-  CPPUNIT_ASSERT( dynamic_cast<Cuboid_impl*>(ShapeFactory::getInstance().produce().getImpl().get()) );
+  ShapeFactory::getInstance().setType(CuboidType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().produce().getType(), CuboidType );
 
-  ShapeFactory::getInstance().setType(ShapeFactory::CYLINDER);
-  CPPUNIT_ASSERT( dynamic_cast<Cylinder_impl*>(ShapeFactory::getInstance().produce().getImpl().get()) );
+  ShapeFactory::getInstance().setType(CylinderType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().produce().getType(), CylinderType );
 }
 
 void ShapeFactoryTest::resizeTest()
 {
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
+  ShapeFactory::getInstance().setType(SphereType);
   ShapeFactory::getInstance().setAngle(0., 0., 0.);
   ShapeFactory::getInstance().setStretch(Vector(2., 2., 2.));
@@ -109 +109 @@
 void ShapeFactoryTest::translateTest()
 {
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
+  ShapeFactory::getInstance().setType(SphereType);
   ShapeFactory::getInstance().setAngle(0., 0., 0.);
   ShapeFactory::getInstance().setStretch(Vector(1., 1., 1.));
@@ -128 +128 @@
 void ShapeFactoryTest::stretchTest()
 {
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
+  ShapeFactory::getInstance().setType(SphereType);
   ShapeFactory::getInstance().setAngle(0., 0., 0.);
   ShapeFactory::getInstance().setStretch(Vector(2., 1., 1.));
@@ -144 +144 @@
 void ShapeFactoryTest::transformTest()
 {
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
+  ShapeFactory::getInstance().setType(SphereType);
   ShapeFactory::getInstance().setAngle(45., 0., 0.);
   ShapeFactory::getInstance().setStretch(Vector(1., 1., 1.));
@@ -160 +160 @@
 void ShapeFactoryTest::getterSetterTest()
 {
-  ShapeFactory::getInstance().setType(ShapeFactory::SPHERE);
-  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().getType(), ShapeFactory::SPHERE );
-  ShapeFactory::getInstance().setType(ShapeFactory::CUBE);
-  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().getType(), ShapeFactory::CUBE );
+  ShapeFactory::getInstance().setType(SphereType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().getType(), SphereType );
+  ShapeFactory::getInstance().setType(CuboidType);
+  CPPUNIT_ASSERT_EQUAL( ShapeFactory::getInstance().getType(), CuboidType );
 #ifndef NDEBUG
-  CPPUNIT_ASSERT_THROW( ShapeFactory::getInstance().setType((ShapeFactory::ShapeType)-1), Assert::AssertionFailure );
+  CPPUNIT_ASSERT_THROW( ShapeFactory::getInstance().setType((ShapeType)-1), Assert::AssertionFailure );
 #endif