Changeset f1cccd for src/tesselationhelpers.cpp

Timestamp:

Aug 17, 2009, 1:20:16 PM (16 years ago)

Author:

Saskia Metzler <metzler@…>

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:

7c14ec

Parents:

093645

Message:

Ticket 14: Rename .._.. functions in boundary.cpp

File:

• src/tesselationhelpers.cpp (modified) (11 diffs)

src/tesselationhelpers.cpp

@@ -8 +8 @@
 #include "tesselationhelpers.hpp"
 
-double det_get(gsl_matrix *A, int inPlace) {
+double DetGet(gsl_matrix *A, int inPlace) {
   /*
   inPlace = 1 => A is replaced with the LU decomposed copy.
@@ -36 +36 @@
 };
 
-void get_sphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
+void GetSphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
 {
   gsl_matrix *A = gsl_matrix_calloc(3,3);
@@ -46 +46 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m11 = det_get(A, 1);
+  m11 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -53 +53 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m12 = det_get(A, 1);
+  m12 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -60 +60 @@
     gsl_matrix_set(A, i, 2, c.x[i]);
   }
-  m13 = det_get(A, 1);
+  m13 = DetGet(A, 1);
 
   for(int i=0;i<3;i++) {
@@ -67 +67 @@
     gsl_matrix_set(A, i, 2, b.x[i]);
   }
-  m14 = det_get(A, 1);
+  m14 = DetGet(A, 1);
 
   if (fabs(m11) < MYEPSILON)
@@ -101 +101 @@
  * @param Umkreisradius double radius of circumscribing circle
  */
-void Get_center_of_sphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
+void GetCenterOfSphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
     double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius)
 {
@@ -107 +107 @@
   double Restradius;
   Vector OtherCenter;
-  cout << Verbose(3) << "Begin of Get_center_of_sphere.\n";
+  cout << Verbose(3) << "Begin of GetCenterOfSphere.\n";
   Center->Zero();
   helper.CopyVector(&a);
@@ -153 +153 @@
   Center->AddVector(&TempNormal);
   cout << Verbose(0) << "Center of sphere of circumference is " << *Center << ".\n";
-  get_sphere(&OtherCenter, a, b, c, RADIUS);
+  GetSphere(&OtherCenter, a, b, c, RADIUS);
   cout << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
-  cout << Verbose(3) << "End of Get_center_of_sphere.\n";
+  cout << Verbose(3) << "End of GetCenterOfSphere.\n";
 };
 
@@ -307 +307 @@
     gsl_multimin_fminimizer *s = NULL;
     gsl_vector *ss, *x;
-    gsl_multimin_function minex_func;
+    gsl_multimin_function minexFunction;
 
     size_t iter = 0;
@@ -324 +324 @@
 
     /* Initialize method and iterate */
-    minex_func.n = NDIM;
-    minex_func.f = &MinIntersectDistance;
-    minex_func.params = (void *)&par;
+    minexFunction.n = NDIM;
+    minexFunction.f = &MinIntersectDistance;
+    minexFunction.params = (void *)&par;
 
     s = gsl_multimin_fminimizer_alloc(T, NDIM);
-    gsl_multimin_fminimizer_set(s, &minex_func, x, ss);
+    gsl_multimin_fminimizer_set(s, &minexFunction, x, ss);
 
     do {