Changeset 437922 for src/boundary.hpp

Timestamp:

Jul 23, 2009, 12:14:13 PM (16 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:

d067d45

Parents:

178f92

Message:

Fix indentation from tab to two spaces.

The trouble was caused at the merge e08f45e4539ffcc30e039dec5606cf06b45ab6be. Seemingly, I thought eclipse had pulled some shit which i didn't

File:

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

src/boundary.hpp

@@ -27 +27 @@
 template <typename T> void SetEndpointsOrdered(T endpoints[2], T endpoint1, T endpoint2)
 {
-        if (endpoint1->Nr < endpoint2->Nr) {
-                endpoints[0] = endpoint1;
-                endpoints[1] = endpoint2;
-        } else {
-                endpoints[0] = endpoint2;
-                endpoints[1] = endpoint1;
-        }
+  if (endpoint1->Nr < endpoint2->Nr) {
+    endpoints[0] = endpoint1;
+    endpoints[1] = endpoint2;
+  } else {
+    endpoints[0] = endpoint2;
+    endpoints[1] = endpoint1;
+  }
 };
 
 class BoundaryPointSet {
-        public:
-                BoundaryPointSet();
-                BoundaryPointSet(atom *Walker);
-                ~BoundaryPointSet();
+  public:
+    BoundaryPointSet();
+    BoundaryPointSet(atom *Walker);
+    ~BoundaryPointSet();
 
-                void AddLine(class BoundaryLineSet *line);
+    void AddLine(class BoundaryLineSet *line);
 
-                LineMap lines;
-                int LinesCount;
-                atom *node;
-                int Nr;
+    LineMap lines;
+    int LinesCount;
+    atom *node;
+    int Nr;
 };
 
 class BoundaryLineSet {
-        public:
-                BoundaryLineSet();
-                BoundaryLineSet(class BoundaryPointSet *Point[2], int number);
-                ~BoundaryLineSet();
+  public:
+    BoundaryLineSet();
+    BoundaryLineSet(class BoundaryPointSet *Point[2], int number);
+    ~BoundaryLineSet();
 
-                void AddTriangle(class BoundaryTriangleSet *triangle);
+    void AddTriangle(class BoundaryTriangleSet *triangle);
 
-                class BoundaryPointSet *endpoints[2];
-                TriangleMap triangles;
-                int TrianglesCount;
-                int Nr;
+    class BoundaryPointSet *endpoints[2];
+    TriangleMap triangles;
+    int TrianglesCount;
+    int Nr;
 };
 
 class BoundaryTriangleSet {
-        public:
-                BoundaryTriangleSet();
-                BoundaryTriangleSet(class BoundaryLineSet *line[3], int number);
-                ~BoundaryTriangleSet();
+  public:
+    BoundaryTriangleSet();
+    BoundaryTriangleSet(class BoundaryLineSet *line[3], int number);
+    ~BoundaryTriangleSet();
 
-                void GetNormalVector(Vector &NormalVector);
+    void GetNormalVector(Vector &NormalVector);
 
-                class BoundaryPointSet *endpoints[3];
-                class BoundaryLineSet *lines[3];
-                Vector NormalVector;
-                int Nr;
+    class BoundaryPointSet *endpoints[3];
+    class BoundaryLineSet *lines[3];
+    Vector NormalVector;
+    int Nr;
 };
 
 class Tesselation {
-        public:
+  public:
 
-                Tesselation();
-                ~Tesselation();
+    Tesselation();
+    ~Tesselation();
 
-                void TesselateOnBoundary(ofstream *out, config *configuration, molecule *mol);
-                void GuessStartingTriangle(ofstream *out);
-                void AddPoint(atom * Walker);
-                void AddTrianglePoint(atom* Candidate, int n);
-                void AddTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
-                void AddTriangleToLines();
-                void Find_starting_triangle(ofstream *out, molecule* mol, const double RADIUS, LinkedCell *LC);
-                bool Find_next_suitable_triangle(ofstream *out, molecule* mol, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, const char *filename, LinkedCell *LC);
-                bool CheckPresenceOfTriangle(ofstream *out, atom *Candidates[3]);
-                void Find_next_suitable_point_via_Angle_of_Sphere(atom* a, atom* b, atom* c, atom* Candidate, atom* Parent, int RecursionLevel, Vector *Chord, Vector *direction1, Vector *OldNormal, Vector ReferencePoint, atom*& Opt_Candidate, double *Storage, const double RADIUS, molecule* mol);
+    void TesselateOnBoundary(ofstream *out, config *configuration, molecule *mol);
+    void GuessStartingTriangle(ofstream *out);
+    void AddPoint(atom * Walker);
+    void AddTrianglePoint(atom* Candidate, int n);
+    void AddTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
+    void AddTriangleToLines();
+    void Find_starting_triangle(ofstream *out, molecule* mol, const double RADIUS, LinkedCell *LC);
+    bool Find_next_suitable_triangle(ofstream *out, molecule* mol, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, const char *filename, LinkedCell *LC);
+    bool CheckPresenceOfTriangle(ofstream *out, atom *Candidates[3]);
+    void Find_next_suitable_point_via_Angle_of_Sphere(atom* a, atom* b, atom* c, atom* Candidate, atom* Parent, int RecursionLevel, Vector *Chord, Vector *direction1, Vector *OldNormal, Vector ReferencePoint, atom*& Opt_Candidate, double *Storage, const double RADIUS, molecule* mol);
 
-                PointMap PointsOnBoundary;
-                LineMap LinesOnBoundary;
-                TriangleMap TrianglesOnBoundary;
-                class BoundaryPointSet *TPS[3]; //this is a Storage for pointers to triangle points, this and BPS[2] needed due to AddLine restrictions
-                class BoundaryPointSet *BPS[2];
-                class BoundaryLineSet *BLS[3];
-                class BoundaryTriangleSet *BTS;
-                int PointsOnBoundaryCount;
-                int LinesOnBoundaryCount;
-                int TrianglesOnBoundaryCount;
-                int TriangleFilesWritten;
+    PointMap PointsOnBoundary;
+    LineMap LinesOnBoundary;
+    TriangleMap TrianglesOnBoundary;
+    class BoundaryPointSet *TPS[3]; //this is a Storage for pointers to triangle points, this and BPS[2] needed due to AddLine restrictions
+    class BoundaryPointSet *BPS[2];
+    class BoundaryLineSet *BLS[3];
+    class BoundaryTriangleSet *BTS;
+    int PointsOnBoundaryCount;
+    int LinesOnBoundaryCount;
+    int TrianglesOnBoundaryCount;
+    int TriangleFilesWritten;
 };