/*******************************************************************************
 * Copyright (c) 2010-2013 by Min Cai (min.cai.china@gmail.com).
 *
 * This file is part of the Archimulator multicore architectural simulator.
 *
 * Archimulator is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * Archimulator is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with Archimulator. If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
package archimulator.util;

/**
 * Interval counter.
 *
 * @author Min Cai
 */
public class IntervalCounter {
    private long valueInPreviousInterval;
    private long value;

    /**
     * Increment.
     */
    public void increment() {
        this.value++;
    }

    /**
     * Reset.
     */
    public void reset() {
        this.value = this.valueInPreviousInterval = 0;
    }

    /**
     * New interval.
     *
     * @return the initial value for the next interval
     */
    public long newInterval() {
        this.valueInPreviousInterval = (this.valueInPreviousInterval + this.value) / 2;
        this.value = 0;
        return this.valueInPreviousInterval;
    }

    /**
     * Get the value.
     *
     * @return the value
     */
    public long getValue() {
        return value;
    }

    @Override
    public String toString() {
        return Long.toString(this.value);
    }
}

@@ -1079,34 +1079,16 @@
 ng value
-InPreviousInterval
 ;%0A    pr
@@ -1103,16 +1103,36 @@
 ng value
+InTheCurrentInterval
 ;%0A%0A    /
@@ -1208,16 +1208,36 @@
 is.value
+InTheCurrentInterval
 ++;%0A    
@@ -1317,39 +1317,41 @@
 alue
- = this.valueInPreviousInterval
+InTheCurrentInterval = this.value
  = 0
@@ -1512,71 +1512,55 @@
 alue
-InPreviousInterval = (this.valueInPreviousInterval + this.value
+ = (this.value + this.valueInTheCurrentInterval
 ) / 
@@ -1572,32 +1572,52 @@
       this.value
+InTheCurrentInterval
  = 0;%0A        re
@@ -1635,26 +1635,8 @@
 alue
-InPreviousInterval
 ;%0A  
@@ -1832,32 +1832,113 @@
 urn 
-Long.toString(this.value
+String.format(%22IntervalCounter%7Bvalue=%25d, valueInTheCurrentInterval=%25d%7D%22, value, valueInTheCurrentInterval
 );%0A 

Fix a bug in IntervalCounter.