Changeset fd4e8c

Timestamp:

Jun 19, 2017, 8:24:17 AM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChemicalSpaceEvaluator, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_Verbose_Codepatterns, ForceAnnealing_oldresults, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps

Children:

836972

Parents:

1ba51c

git-author:

Frederik Heber <heber@…> (03/31/17 09:03:09)

git-committer:

Frederik Heber <frederik.heber@…> (06/19/17 08:24:17)

Message:

GeometryRegistry knows a list of protected names.

Location:

src/Geometry

Files:

• GeometryRegistry.cpp (modified) (2 diffs)
• GeometryRegistry.hpp (modified) (1 diff)

src/Geometry/GeometryRegistry.cpp

@@ -37 +37 @@
 #include "GeometryRegistry.hpp"
 
+#include <algorithm>
+#include <boost/assign.hpp>
+
 #include "CodePatterns/Singleton_impl.hpp"
 #include "CodePatterns/Registry_impl.hpp"
 #include "CodePatterns/Observer/Channels.hpp"
+
+using namespace boost::assign;
 
 GeometryRegistry::GeometryRegistry() :
@@ -93 +98 @@
 }
 
+static std::vector<std::string> setProtectedNames()
+{
+  std::vector<std::string> names;
+  names += std::string("zeroVector"),
+      std::string("unitVectorX"),
+      std::string("unitVectorY"),
+      std::string("unitVectorZ");
+  return names;
+}
+
+bool GeometryRegistry::isProtectedName(const std::string &_name) const
+{
+  static std::vector<std::string> protected_names = setProtectedNames();
+
+  if (std::count(protected_names.begin(), protected_names.end(), _name) != 0)
+    return true;
+  return false;
+}
+
 CONSTRUCT_SINGLETON(GeometryRegistry)
 CONSTRUCT_REGISTRY(GeometryObject)

src/Geometry/GeometryRegistry.hpp

@@ -46 +46 @@
   GeometryObject *lastChanged() const { return _lastchanged;  }
 
+  bool isProtectedName(const std::string &_name) const;
+
 private:
   void fillRegistry();