Changeset a367b8

Timestamp:

Nov 15, 2012, 5:31:06 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:

4dc309

Parents:

4477b7

git-author:

Michael Ankele <ankele@…> (09/05/12 15:38:31)

git-committer:

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

Message:

ShapeFactoryUnitTest added

Location:

src/Shapes

Files:

• Shape.hpp (modified) (2 diffs)
• ShapeFactory.cpp (modified) (1 diff)
• ShapeFactory.hpp (modified) (1 diff)
• unittests/Makefile.am (modified) (4 diffs)
• unittests/ShapeFactoryUnitTest.cpp (added)
• unittests/ShapeFactoryUnitTest.hpp (added)

src/Shapes/Shape.hpp

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

src/Shapes/ShapeFactory.cpp

@@ -85 +85 @@
 
 
+void ShapeFactory::setType(ShapeType type)
+{
+  ShapeNameMap::iterator iter = shapeNameMap.find(type);
+  ASSERT(iter != shapeNameMap.end(),
+      "ShapeFactory::setType() - unknown type: "+toString(type)+".");
+  this->type = type;
+}
+
 void ShapeFactory::setStretch(const Vector &stretch)
 {
-  ASSERT(!stretch.IsZero(),
-      "ShapeFactory::setStretch() - stretch is zero.");
+  for (int i=0; i<NDIM; i++){
+    ASSERT(stretch[i] > 0,
+      "ShapeFactory::setStretch() - non positive component.");
+  }
   this->stretch = stretch;
 }

src/Shapes/ShapeFactory.hpp

@@ -44 +44 @@
 
   ShapeType getType() const { return type; }
-  void setType(ShapeType type) { this->type = type; }
+  void setType(ShapeType type);
 
   // create a shape

src/Shapes/unittests/Makefile.am

@@ -5 +5 @@
 SHAPETESTSSOURCES = \
         ../Shapes/unittests/BaseShapesUnitTest.cpp \
+        ../Shapes/unittests/ShapeFactoryUnitTest.cpp \
         ../Shapes/unittests/ShapeOpsUnitTest.cpp \
         ../Shapes/unittests/Shape_HomogeneousPointsUnitTest.cpp
@@ -10 +11 @@
 SHAPETESTSHEADERS= \
         ../Shapes/unittests/BaseShapesUnitTest.hpp \
+        ../Shapes/unittests/ShapeFactoryUnitTest.hpp \
         ../Shapes/unittests/ShapeOpsUnitTest.hpp \
         ../Shapes/unittests/Shape_HomogeneousPointsUnitTest.cpp
@@ -15 +17 @@
 SHAPETESTS = \
   BaseShapesUnitTest \
+  ShapeFactoryUnitTest \
   ShapeOpsUnitTest \
   Shape_HomogeneousPointsUnitTest
@@ -38 +41 @@
 BaseShapesUnitTest_LDADD = $(SHAPELIBS)
 
+ShapeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Shapes/unittests/ShapeFactoryUnitTest.cpp \
+        ../Shapes/unittests/ShapeFactoryUnitTest.hpp \
+        ../Shapes/unittests/stubs/ApproximateShapeAreaStub.cpp \
+        ../Shapes/unittests/stubs/ApproximateShapeVolumeStub.cpp
+nodist_ShapeFactoryUnitTest_SOURCES = \
+        ../Helpers/defs.hpp \
+        ../Helpers/defs.cpp
+ShapeFactoryUnitTest_LDADD = $(SHAPELIBS)
+
 ShapeOpsUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         ../Shapes/unittests/ShapeOpsUnitTest.cpp \