removed current ruptures counter; it was only used for ui stuff

larsbutler · Nov 22, 2011 · b10ac8f · b10ac8f
1 parent c8f3f88
commit b10ac8f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/java/org/opensha/sha/calc/HazardCurveCalculator.java b/java/org/opensha/sha/calc/HazardCurveCalculator.java
@@ -111,7 +111,6 @@ public class HazardCurveCalculator extends UnicastRemoteObject implements
     private ParameterList adjustableParams;
 
     // misc counting and index variables
-    protected int currRuptures = -1;
     protected int sourceIndex;
     protected int numSources;
 
@@ -310,8 +309,6 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
             System.out.println("Haz Curv Calc: magDistCutoffParam.getValue()="
                     + magDistCutoffParam.getValue().toString());
 
-        this.currRuptures = -1;
-
         /*
          * this determines how the calculations are done (doing it the way it's
          * outlined in our original SRL paper gives probs greater than 1 if the
@@ -348,9 +345,6 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
         // get total number of sources
         numSources = eqkRupForecast.getNumSources();
 
-        // init the current rupture number (also for progress bar)
-        currRuptures = 0;
-
         // initialize the hazard function to 1.0
         initDiscretizeValues(hazFunction, 1.0);
 
@@ -380,8 +374,6 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
 
             // apply distance cutoff to source
             if (distance > maxDistance) {
-                currRuptures += source.getNumRuptures(); // update progress bar
-                                                         // for skipped ruptures
                 continue;
             }
 
@@ -404,7 +396,7 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
             int numRuptures = source.getNumRuptures();
 
             // loop over these ruptures
-            for (int n = 0; n < numRuptures; n++, ++currRuptures) {
+            for (int n = 0; n < numRuptures; n++) {
 
                 EqkRupture rupture = source.getRupture(n);
 
@@ -526,13 +518,9 @@ public DiscretizedFuncAPI getAverageEventSetHazardCurve(
         hazCurve = hazFunction.deepClone();
         initDiscretizeValues(hazFunction, 0);
         int numPts = hazCurve.getNum();
-        // for progress bar
-        currRuptures = 0;
-        // totRuptures=numEventSets;
 
         for (int i = 0; i < numEventSets; i++) {
             ArrayList<EqkRupture> events = eqkRupForecast.drawRandomEventSet();
-            currRuptures += events.size();
             getEventSetHazardCurve(hazCurve, site, imr, events, false);
             for (int x = 0; x < numPts; x++)
                 hazFunction.set(x, hazFunction.getY(x) + hazCurve.getY(x));
@@ -595,10 +583,6 @@ public DiscretizedFuncAPI getEventSetHazardCurve(
         imr.setUserMaxDistance(maxDistance);
 
         int totRups = eqkRupList.size();
-        // progress bar stuff
-        if (updateCurrRuptures) {
-            currRuptures = 0;
-        }
 
         // initialize the hazard function to 1.0 (initial total non-exceedance
         // probability)
@@ -613,9 +597,6 @@ public DiscretizedFuncAPI getEventSetHazardCurve(
         // loop over ruptures
         for (int n = 0; n < totRups; n++) {
 
-            if (updateCurrRuptures)
-                ++currRuptures;
-
             EqkRupture rupture = eqkRupList.get(n);
 
             // set the EqkRup in the IMR
@@ -702,15 +683,6 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
         return hazFunction;
     }
 
-    /**
-     * 
-     * @returns the current rupture being traversed
-     * @throws java.rmi.RemoteException
-     */
-    public int getCurrRuptures() throws java.rmi.RemoteException {
-        return this.currRuptures;
-    }
-
     /**
      * stops the Hazard Curve calculations.
      * 

diff --git a/java/org/opensha/sha/calc/HazardCurveCalculatorAPI.java b/java/org/opensha/sha/calc/HazardCurveCalculatorAPI.java
@@ -190,9 +190,6 @@ public DiscretizedFuncAPI getHazardCurve(DiscretizedFuncAPI hazFunction,
             Site site, ScalarIntensityMeasureRelationshipAPI imr,
             EqkRupture rupture) throws java.rmi.RemoteException;
 
-    // gets the current rupture that is being processed
-    public int getCurrRuptures() throws java.rmi.RemoteException;
-
     /**
      * stops the Hazard Curve calculations.
      *