Ignore:
Timestamp:
Aug 17, 2009, 1:20:16 PM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
d6b011
Parents:
3de1d2
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • molecuilder/src/tesselationhelpers.cpp

    r3de1d2 r48cd93  
    88#include "tesselationhelpers.hpp"
    99
    10 double det_get(gsl_matrix *A, int inPlace) {
     10double DetGet(gsl_matrix *A, int inPlace) {
    1111  /*
    1212  inPlace = 1 => A is replaced with the LU decomposed copy.
     
    3636};
    3737
    38 void get_sphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
     38void GetSphere(Vector *center, Vector &a, Vector &b, Vector &c, double RADIUS)
    3939{
    4040  gsl_matrix *A = gsl_matrix_calloc(3,3);
     
    4646    gsl_matrix_set(A, i, 2, c.x[i]);
    4747  }
    48   m11 = det_get(A, 1);
     48  m11 = DetGet(A, 1);
    4949
    5050  for(int i=0;i<3;i++) {
     
    5353    gsl_matrix_set(A, i, 2, c.x[i]);
    5454  }
    55   m12 = det_get(A, 1);
     55  m12 = DetGet(A, 1);
    5656
    5757  for(int i=0;i<3;i++) {
     
    6060    gsl_matrix_set(A, i, 2, c.x[i]);
    6161  }
    62   m13 = det_get(A, 1);
     62  m13 = DetGet(A, 1);
    6363
    6464  for(int i=0;i<3;i++) {
     
    6767    gsl_matrix_set(A, i, 2, b.x[i]);
    6868  }
    69   m14 = det_get(A, 1);
     69  m14 = DetGet(A, 1);
    7070
    7171  if (fabs(m11) < MYEPSILON)
     
    101101 * @param Umkreisradius double radius of circumscribing circle
    102102 */
    103 void Get_center_of_sphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
     103void GetCenterOfSphere(Vector* Center, Vector a, Vector b, Vector c, Vector *NewUmkreismittelpunkt, Vector* Direction, Vector* AlternativeDirection,
    104104    double HalfplaneIndicator, double AlternativeIndicator, double alpha, double beta, double gamma, double RADIUS, double Umkreisradius)
    105105{
     
    107107  double Restradius;
    108108  Vector OtherCenter;
    109   cout << Verbose(3) << "Begin of Get_center_of_sphere.\n";
     109  cout << Verbose(3) << "Begin of GetCenterOfSphere.\n";
    110110  Center->Zero();
    111111  helper.CopyVector(&a);
     
    153153  Center->AddVector(&TempNormal);
    154154  cout << Verbose(0) << "Center of sphere of circumference is " << *Center << ".\n";
    155   get_sphere(&OtherCenter, a, b, c, RADIUS);
     155  GetSphere(&OtherCenter, a, b, c, RADIUS);
    156156  cout << Verbose(0) << "OtherCenter of sphere of circumference is " << OtherCenter << ".\n";
    157   cout << Verbose(3) << "End of Get_center_of_sphere.\n";
     157  cout << Verbose(3) << "End of GetCenterOfSphere.\n";
    158158};
    159159
     
    307307    gsl_multimin_fminimizer *s = NULL;
    308308    gsl_vector *ss, *x;
    309     gsl_multimin_function minex_func;
     309    gsl_multimin_function minexFunction;
    310310
    311311    size_t iter = 0;
     
    324324
    325325    /* Initialize method and iterate */
    326     minex_func.n = NDIM;
    327     minex_func.f = &MinIntersectDistance;
    328     minex_func.params = (void *)&par;
     326    minexFunction.n = NDIM;
     327    minexFunction.f = &MinIntersectDistance;
     328    minexFunction.params = (void *)&par;
    329329
    330330    s = gsl_multimin_fminimizer_alloc(T, NDIM);
    331     gsl_multimin_fminimizer_set(s, &minex_func, x, ss);
     331    gsl_multimin_fminimizer_set(s, &minexFunction, x, ss);
    332332
    333333    do {
Note: See TracChangeset for help on using the changeset viewer.