Changeset 87ec81 for src

Timestamp:

Sep 19, 2013, 8:24:28 PM (11 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:

192397

Parents:

d5521e

git-author:

Frederik Heber <heber@…> (09/17/13 23:16:06)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:24:28)

Message:

ShapeFactory removed from libMolecuilderShapes.

• Factory is right now required only in CombineShapesAction and CreateShapeAction. Hence, it is moved over to libMolecuilder to keep ..Shapes a low-dependency lib.
• ShapeRegistry::getDefaultNameForShape() now gets just string, ShapeFactory is queried in Actions for getShapeName() as baseName.
• added stubs for World and molecule to ShapeFactoryUnitTest deps.

Location:

src

Files:

• Actions/ShapeAction/CombineShapesAction.cpp (modified) (2 diffs)
• Actions/ShapeAction/CreateShapeAction.cpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• Shapes/Makefile.am (modified) (2 diffs)
• Shapes/ShapeRegistry.cpp (modified) (1 diff)
• Shapes/ShapeRegistry.hpp (modified) (1 diff)
• Shapes/unittests/Makefile.am (modified) (1 diff)
• Shapes/unittests/stubs/WorldSelectedMoleculesStub.cpp (added)
• Shapes/unittests/stubs/moleculeStub.cpp (added)

src/Actions/ShapeAction/CombineShapesAction.cpp

@@ -36 +36 @@
 
 #include "Shapes/BaseShapes.hpp"
+#include "Shapes/ShapeFactory.hpp"
 #include "Shapes/ShapeRegistry.hpp"
 #include "CodePatterns/Log.hpp"
@@ -82 +83 @@
   if (params.shape_name.get() != "")
     s.setName(params.shape_name.get());
-  else
-    s.setName(ShapeRegistry::getInstance().getDefaultNameForShape(s));
+  else {
+    const std::string baseName = 
+        ShapeFactory::getInstance().getShapeName(s.getType());
+    s.setName(
+        ShapeRegistry::getInstance().getDefaultNameForShape(baseName)
+    );
+  }
   std::string old_name = s.getName();
   std::cout << s.getName() << "\n";

src/Actions/ShapeAction/CreateShapeAction.cpp

@@ -59 +59 @@
   if (params.shape_name.get() != "")
     s.setName(params.shape_name.get());
-  else
-    s.setName(ShapeRegistry::getInstance().getDefaultNameForShape(s));
+  else {
+    const std::string baseName = 
+        ShapeFactory::getInstance().getShapeName(s.getType());
+    s.setName(ShapeRegistry::getInstance().getDefaultNameForShape(baseName));
+  }
   std::string old_name = s.getName();
   std::cout << s.getName() << "\n";
@@ -87 +90 @@
   if (state->params.shape_name.get() != "")
     s.setName(state->params.shape_name.get());
-  else
-    s.setName(ShapeRegistry::getInstance().getDefaultNameForShape(s));
+  else {
+    const std::string baseName = 
+        ShapeFactory::getInstance().getShapeName(s.getType());
+    s.setName(ShapeRegistry::getInstance().getDefaultNameForShape(baseName));
+  }
   std::string old_name = s.getName();
   std::cout << s.getName() << "\n";

src/Makefile.am

@@ -184 +184 @@
   ${THERMOSTATSOURCE} \
   ${TESSELATIONSOURCE} \
+  Shapes/ShapeFactory.cpp \
   AtomIdSet.cpp \
   Box.cpp \
@@ -206 +207 @@
   ${THERMOSTATHEADER} \
   ${TESSELATIONHEADER} \
+  Shapes/ShapeFactory.hpp \
   AtomIdSet.hpp \
   Box.hpp \

src/Shapes/Makefile.am

@@ -5 +5 @@
   Shapes/BaseShapes.cpp \
   Shapes/Shape.cpp \
-  Shapes/ShapeFactory.cpp \
   Shapes/ShapeOps.cpp \
   Shapes/ShapeRegistry.cpp
@@ -14 +13 @@
   Shapes/Shape_impl.hpp \
   Shapes/ShapeExceptions.hpp \
-  Shapes/ShapeFactory.hpp \
   Shapes/ShapeOps.hpp \
   Shapes/ShapeOps_impl.hpp \

src/Shapes/ShapeRegistry.cpp

@@ -147 +147 @@
 }
 
-std::string ShapeRegistry::getDefaultNameForShape(Shape s) const
+std::string ShapeRegistry::getDefaultNameForShape(const std::string &baseName) const
 {
-  std::string baseName = ShapeFactory::getInstance().getShapeName(s.getType());
   int n = 1;
   while(true){

src/Shapes/ShapeRegistry.hpp

@@ -30 +30 @@
   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;
+  std::string getDefaultNameForShape(const std::string &baseName) const;
 
   enum NotificationType {

src/Shapes/unittests/Makefile.am

@@ -48 +48 @@
         ../Shapes/unittests/ShapeFactoryUnitTest.hpp \
         ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
-        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
+        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp \
+        ../Shapes/unittests/stubs/moleculeStub.cpp \
+        ../Shapes/unittests/stubs/WorldSelectedMoleculesStub.cpp
 nodist_ShapeFactoryUnitTest_SOURCES = \
         ../Helpers/defs.hpp \
-        ../Helpers/defs.cpp
-ShapeFactoryUnitTest_LDADD = $(SHAPELIBS)
+        ../Helpers/defs.cpp \
+        ../Shapes/ShapeFactory.cpp \
+        ../Shapes/ShapeFactory.hpp
+ShapeFactoryUnitTest_LDADD = \
+        ../libMolecuilderElement.la \
+        $(SHAPELIBS)
 
 ShapeOpsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \