ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/transportSimplex.h
(Generate patch)

Comparing ray/src/cv/transportSimplex.h (file contents):
Revision 2.1 by greg, Wed Mar 26 02:52:31 2014 UTC vs.
Revision 2.2 by greg, Sat Aug 1 23:27:04 2015 UTC

# Line 160 | Line 160 | double transportSimplex(TsSignature<TF> *signature1, T
160                  snkSum += signature2->weights[j];
161          
162          diff = srcSum - snkSum;
163 <        if (fabs(diff) > TSEPSILON * srcSum)
163 >        if (fabs(diff) > TSEPSILON * srcSum) {
164                  if (diff < 0.0)
165                          n1++;
166                  else
167                          n2++;
168 <        
168 >        }
169          _tsMaxW = srcSum > snkSum ? srcSum : snkSum;
170          w = srcSum < snkSum ? srcSum : snkSum;
171      
# Line 408 | Line 408 | double _pivot(TsBasic * basics, TsBasic ** srcBasics,
408                                  lowVal = spitrb->node->val;
409                          }
410                          add = !add;
411 <                } while (spitrb = spitrb->prev);
411 >                } while ((spitrb = spitrb->prev));
412                  
413                  add = false;
414                  spitrb = spitra;
# Line 418 | Line 418 | double _pivot(TsBasic * basics, TsBasic ** srcBasics,
418                          if (add) spitrb->node->val += lowVal;
419                          else spitrb->node->val -= lowVal;
420                          add = !add;
421 <                } while (spitrb = spitrb->prev);
421 >                } while ((spitrb = spitrb->prev));
422  
423                  i = leaving->node->i;
424                  j = leaving->node->j;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines