Changeset a89a22 for molecuilder/src/vector.cpp

Timestamp:

Jun 7, 2008, 1:21:33 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

32b6dc

Parents:

75793b2

Message:

these are all smaller fixes due to extensively enabled compiler warnings

e.g. local variable shadows definition of a global one

File:

• molecuilder/src/vector.cpp (modified) (10 diffs)

molecuilder/src/vector.cpp

@@ -354 +354 @@
 {
   double projection;
-  projection = ScalarProduct(n)/((vector *)n)->ScalarProduct(n);    // remove constancy from n (keep as logical one)
+  projection = ScalarProduct(n)/n->ScalarProduct(n);    // remove constancy from n (keep as logical one)
   // withdraw projected vector twice from original one
   cout << Verbose(1) << "Vector: ";
@@ -458 +458 @@
  * \return true - success, false - failure (null vector given)
  */
-bool vector::GetOneNormalVector(const vector *vector)
+bool vector::GetOneNormalVector(const vector *GivenVector)
 {
   int Components[NDIM]; // contains indices of non-zero components
@@ -466 +466 @@
 
   cout << Verbose(4);
-  vector->Output((ofstream *)&cout);
+  GivenVector->Output((ofstream *)&cout);
   cout << endl;
   for (j=NDIM;j--;)
@@ -472 +472 @@
   // find two components != 0
   for (j=0;j<NDIM;j++)
-    if (fabs(vector->x[j]) > MYEPSILON)
+    if (fabs(GivenVector->x[j]) > MYEPSILON)
       Components[Last++] = j;
   cout << Verbose(4) << Last << " Components != 0: (" << Components[0] << "," << Components[1] << "," << Components[2] << ")" << endl;
@@ -479 +479 @@
     case 3:  // threecomponent system
     case 2:  // two component system
-      norm = sqrt(1./(vector->x[Components[1]]*vector->x[Components[1]]) + 1./(vector->x[Components[0]]*vector->x[Components[0]]));
+      norm = sqrt(1./(GivenVector->x[Components[1]]*GivenVector->x[Components[1]]) + 1./(GivenVector->x[Components[0]]*GivenVector->x[Components[0]]));
       x[Components[2]] = 0.;
       // in skp both remaining parts shall become zero but with opposite sign and third is zero
-      x[Components[1]] = -1./vector->x[Components[1]] / norm;
-      x[Components[0]] = 1./vector->x[Components[0]] / norm;
+      x[Components[1]] = -1./GivenVector->x[Components[1]] / norm;
+      x[Components[0]] = 1./GivenVector->x[Components[0]] / norm;
       return true;
       break;
@@ -519 +519 @@
      gsl_multimin_fminimizer_nmsimplex;
    gsl_multimin_fminimizer *s = NULL;
-   gsl_vector *ss, *x;
+   gsl_vector *ss, *y;
    gsl_multimin_function minex_func;
  
@@ -528 +528 @@
    /* Initial vertex size vector */
    ss = gsl_vector_alloc (np);
-   x = gsl_vector_alloc (np);
+   y = gsl_vector_alloc (np);
  
    /* Set all step sizes to 1 */
@@ -538 +538 @@
         
          for (i=NDIM;i--;)
-                gsl_vector_set(x, i, (vectors[0]->x[i] - vectors[1]->x[i])/2.); 
+                gsl_vector_set(y, i, (vectors[0]->x[i] - vectors[1]->x[i])/2.); 
          
    /* Initialize method and iterate */
@@ -546 +546 @@
  
    s = gsl_multimin_fminimizer_alloc (T, np);
-   gsl_multimin_fminimizer_set (s, &minex_func, x, ss);
+   gsl_multimin_fminimizer_set (s, &minex_func, y, ss);
  
    do
@@ -575 +575 @@
   for (i=(size_t)np;i--;)
     this->x[i] = gsl_vector_get(s->x, i);
-   gsl_vector_free(x);
+   gsl_vector_free(y);
    gsl_vector_free(ss);
    gsl_multimin_fminimizer_free (s);