Changeset 4246


Ignore:
Timestamp:
07/23/08 16:30:45 (12 years ago)
Author:
nor
Message:

Disables debugging prints, fixed progress meter

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/slim/BurnInRenderer.java

    r4244 r4246  
    5656    currProgress = 0; 
    5757    maxDim = 1 << subsampleLevel; // 2^subsampleLevel 
    58     maxProgress = 2 * maxDim * maxDim - 1; 
     58    //maxProgress = 2 * maxDim * maxDim - 1; 
     59    maxProgress = 0; 
     60    int thislevel = 1; 
     61    for(int i = subsampleLevel; i >= 0; i--) { 
     62      maxProgress += thislevel; 
     63      thislevel *= 4; 
     64    } 
    5965    alive = false; 
    6066    maxIterations = 1000; 
     
    7884    while(subsampleLevel >= 0 && alive && !estimated) { 
    7985      currentCurves = curveData.getCurves(subsampleLevel); 
    80       while(currentY < currentDim || !alive) { 
    81         while(currentX < currentDim || !alive) { 
    82           System.out.println("ssl: " + subsampleLevel + " x: " + currentX + " y: " + currentY); 
     86      while(currentY < currentDim && alive) { 
     87        while(currentX < currentDim && alive) { 
     88          //System.out.println("ssl: " + subsampleLevel + " x: " + currentX + " y: " + currentY); 
    8389          // HACKY CRAP: GET RID OF THIS IN FINAL VERSION OR SUFFER 
    8490          int[] cdata = currentCurves[currentY][currentX].getData(); 
     
    9298          } 
    9399          currentCurves[currentY][currentX].setFirst(maxIndex); 
    94           System.out.println("Set first to " + maxIndex); 
     100          //System.out.println("Set first to " + maxIndex); 
    95101          // END HACKY CRAP 
    96102          currentCurves[currentY][currentX].estimate(); 
     
    99105          for(int i = 0; i < numExponentials; i++) { 
    100106            exponentials[i] = curve[i][1]; 
    101             System.out.println("b" + i + ": " + exponentials[i]); 
     107            //System.out.println("b" + i + ": " + exponentials[i]); 
    102108          } 
    103109          Arrays.sort(exponentials); 
     
    136142    while(alive && !improving) { 
    137143      if(!estimated) { 
    138         System.out.println("Set estimated"); 
     144        //System.out.println("Set estimated"); 
    139145        estimated = true; 
    140146        currentX = 0; 
     
    145151          currentIterations = 0; 
    146152          while(currentIterations < maxIterations) { 
    147             System.out.println("x: " + currentX + " y: " + currentY + " iter: " + currentIterations); 
     153            //System.out.println("x: " + currentX + " y: " + currentY + " iter: " + currentIterations); 
    148154            currentIterations++; 
    149155            double currRCSE = currentCurves[currentY][currentX].getReducedChiSquaredError(); 
     
    170176    } 
    171177    // continuing improvement 
    172     System.out.println("Got to continuing"); 
     178    //System.out.println("Got to continuing"); 
    173179    while(alive) { 
    174180      improving = true; 
Note: See TracChangeset for help on using the changeset viewer.