Changeset 88b400 for src/BoundaryMaps.hpp

Timestamp:

Aug 7, 2010, 1:46:16 PM (15 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, Candidate_v1.7.0, Candidate_v1.7.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:

5b4605

Parents:

44de80

Message:

converted #define's to enums, consts and typedefs [Meyers, "Effective C++", item 1].

basic changes:

• #define bla 1.3 -> const double bla = 1.3
• #define bla "test" -> const char * const bla = "test
• use class specific constants! (HULLEPSILON)

const int Class::bla = 1.3; (in .cpp)
static const int bla; (in .hpp inside class private section)

• "enum hack": #define bla 5 -> enum { bla = 5 };
  • if const int bla=5; impossible
  • e.g. necessary if constant is used in array declaration (int blabla[bla];)

details:

• new file defs.cpp where const double reside in and are referenced by extern "C" const double
• joiner.cpp: main() had to be changed due to concatenation of two #define possible, of two const char * not
• class specific constants: HULLEPSILON, BONDTHRESHOLD, SPHERERADIUS
• extended GetPathLengthonCircumCircle to additional parameter HULLEPSILON

File:

• src/BoundaryMaps.hpp (modified) (1 diff)

src/BoundaryMaps.hpp

@@ -9 +9 @@
 #define BOUNDARYMAPS_HPP_
 
-#define IndexToIndex std::map <int, int>
+class BoundaryPointSet;
+class BoundaryLineSet;
+class BoundaryTriangleSet;
+class BoundaryPolygonSet;
+class CandidateForTesselation;
+class TesselPoint;
 
-#define PointMap std::map < int, class BoundaryPointSet * >
-#define PointSet std::set < class BoundaryPointSet * >
-#define PointList std::list < class BoundaryPointSet * >
-#define PointPair std::pair < int, class BoundaryPointSet * >
-#define PointTestPair std::pair < PointMap::iterator, bool >
+#include <list>
+#include <map>
+#include <set>
 
-#define CandidateList std::list <class CandidateForTesselation *>
-#define CandidateMap std::map <class BoundaryLineSet *, class CandidateForTesselation *>
+typedef std::map <int, int> IndexToIndex;
 
-#define LineMap std::multimap < int, class BoundaryLineSet * >
-#define LineSet std::set < class BoundaryLineSet * >
-#define LineList std::list < class BoundaryLineSet * >
-#define LinePair std::pair < int, class BoundaryLineSet * >
-#define LineTestPair std::pair < LineMap::iterator, bool >
+typedef std::map < int, class BoundaryPointSet * > PointMap;
+typedef std::set < class BoundaryPointSet * > PointSet;
+typedef std::list < class BoundaryPointSet * > PointList;
+typedef std::pair < int, class BoundaryPointSet * > PointPair;
+typedef std::pair < PointMap::iterator, bool > PointTestPair;
 
-#define TriangleMap std::map < int, class BoundaryTriangleSet * >
-#define TriangleSet std::set < class BoundaryTriangleSet * >
-#define TriangleList std::list < class BoundaryTriangleSet * >
-#define TrianglePair std::pair < int, class BoundaryTriangleSet * >
-#define TriangleTestPair std::pair < TrianglePair::iterator, bool >
+typedef std::list <class CandidateForTesselation *> CandidateList;
+typedef std::map <class BoundaryLineSet *, class CandidateForTesselation *> CandidateMap;
 
-#define PolygonMap std::map < int, class BoundaryPolygonSet * >
-#define PolygonSet std::set < class BoundaryPolygonSet * >
-#define PolygonList std::list < class BoundaryPolygonSet * >
+typedef std::multimap < int, class BoundaryLineSet * > LineMap;
+typedef std::set < class BoundaryLineSet * > LineSet;
+typedef std::list < class BoundaryLineSet * > LineList;
+typedef std::pair < int, class BoundaryLineSet * > LinePair;
+typedef std::pair < LineMap::iterator, bool > LineTestPair;
 
-#define DistanceToPointMap std::multimap <double, class BoundaryPointSet * >
-#define DistanceToPointPair std::pair <double, class BoundaryPointSet * >
+typedef std::map < int, class BoundaryTriangleSet * > TriangleMap;
+typedef std::set < class BoundaryTriangleSet * > TriangleSet;
+typedef std::list < class BoundaryTriangleSet * > TriangleList;
+typedef std::pair < int, class BoundaryTriangleSet * > TrianglePair;
+typedef std::pair < TriangleMap::iterator, bool > TriangleTestPair;
 
-#define DistanceMultiMap std::multimap <double, std::pair < PointMap::iterator, PointMap::iterator> >
-#define DistanceMultiMapPair std::pair <double, std::pair < PointMap::iterator, PointMap::iterator> >
+typedef std::map < int, class BoundaryPolygonSet * > PolygonMap;
+typedef std::set < class BoundaryPolygonSet * > PolygonSet;
+typedef std::list < class BoundaryPolygonSet * > PolygonList;
 
-#define TesselPointList std::list <TesselPoint *>
-#define TesselPointSet std::set <TesselPoint *>
+typedef std::multimap <double, class BoundaryPointSet * > DistanceToPointMap;
+typedef std::pair <double, class BoundaryPointSet * > DistanceToPointPair;
 
-#define ListOfTesselPointList std::list<std::list <TesselPoint *> *>
+typedef std::multimap <double, std::pair < PointMap::iterator, PointMap::iterator> > DistanceMultiMap;
+typedef std::pair <double, std::pair < PointMap::iterator, PointMap::iterator> > DistanceMultiMapPair;
+
+typedef std::list <TesselPoint *> TesselPointList;
+typedef std::set <TesselPoint *> TesselPointSet;
+
+typedef std::list<std::list <TesselPoint *> *> ListOfTesselPointList;
 
 enum centers {Opt, OtherOpt};
 
-#define HULLEPSILON 1e-9 //!< TODO: Get rid of HULLEPSILON, points to numerical instabilities