Changeset 36e658

Timestamp:

Apr 21, 2008, 2:19:25 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

2cab03a

Parents:

d48972

git-author:

Frederik Heber <heber@…> (04/18/08 15:38:00)

git-committer:

Frederik Heber <heber@…> (04/21/08 14:19:25)

Message:

CalculateConDir(): wrote Gamma calculation more compact

File:

• pcp/src/grad.c (modified) (2 diffs)

pcp/src/grad.c

@@ -624 +624 @@
   S[2] = PsiSP[1]; 
   if (step) { // only in later steps is the scalar product used, but always condir stored in oldcondir and Ortho (working gradient)
-    if (fabs(S[1]) < MYEPSILON) fprintf(stderr,"CalculateConDir: S[1] = %lg\n",S[1]);
-    Gamma = (S[0]-S[2])/S[1];  // the final CG beta coefficient (Polak-Ribiere)
     if (fabs(S[1]) < MYEPSILON) {
       if (fabs((S[0]-S[2])) < MYEPSILON)  
@@ -631 +629 @@
       else
         Gamma = 0.0;
-    }
+    } else
+      Gamma = (S[0]-S[2])/S[1];  // the final CG beta coefficient (Polak-Ribiere)  
     if (Gamma < 0) { // Polak-Ribiere with automatic restart: gamma = max {0, gamma}
       Gamma = 0.;