You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/05/16 22:01:26 UTC
svn commit: r407041 - in /jakarta/jmeter/branches/rel-2-1/src:
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/util/
jorphan/org/apache/jorphan/math/
Author: sebb
Date: Tue May 16 13:01:25 2006
New Revision: 407041
URL: http://svn.apache.org/viewcvs?rev=407041&view=rev
Log:
Move Calculator so it can access Result fields;
Allow for multiple samples in a Result
Added:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/Calculator.java
- copied, changed from r406467, jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/Calculator.java
Removed:
jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/Calculator.java
Modified:
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=407041&r1=407040&r2=407041&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/SummaryReport.java Tue May 16 13:01:25 2006
@@ -33,10 +33,10 @@
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.util.Calculator;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.gui.ObjectTableModel;
-import org.apache.jorphan.math.Calculator;
import org.apache.jorphan.reflect.Functor;
/**
@@ -102,9 +102,9 @@
model.insertRow(row, model.getRowCount() - 1);
}
}
- row.addSample(res.getBytes(),res.getTime(),res.isSuccessful(),res.getStartTime(),res.getEndTime());
+ row.addSample(res);
Calculator tot = ((Calculator) tableRows.get(TOTAL_ROW_LABEL));
- tot.addSample(res.getBytes(),res.getTime(),res.isSuccessful(),res.getStartTime(),res.getEndTime());
+ tot.addSample(res);
model.fireTableDataChanged();
}
Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=407041&r1=407040&r2=407041&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Tue May 16 13:01:25 2006
@@ -32,12 +32,12 @@
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.Calculator;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.gui.ObjectTableModel;
import org.apache.jorphan.gui.layout.VerticalLayout;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.math.Calculator;
import org.apache.jorphan.reflect.Functor;
import org.apache.log.Logger;
Copied: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/Calculator.java (from r406467, jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/Calculator.java)
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/Calculator.java?p2=jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/Calculator.java&p1=jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/Calculator.java&r1=406467&r2=407041&rev=407041&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/math/Calculator.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/Calculator.java Tue May 16 13:01:25 2006
@@ -15,10 +15,12 @@
*
*/
-package org.apache.jorphan.math;
+package org.apache.jmeter.util;
import java.text.DecimalFormat;
+import org.apache.jmeter.samplers.SampleResult;
+
/**
* Class to calculate various items that don't require all previous results to be saved:
* - mean = average
@@ -73,17 +75,21 @@
}
public void addValue(long newValue) {
- count++;
- minimum=Math.min(newValue, minimum);
- maximum=Math.max(newValue, maximum);
- double currentVal = newValue;
- sum += currentVal;
- sumOfSquares += currentVal * currentVal;
- // Calculate each time, as likely to be called for each add
- mean = sum / count;
- deviation = Math.sqrt((sumOfSquares / count) - (mean * mean));
+ addValue(newValue,1);
}
+ private void addValue(long newValue, int sampleCount) {
+ count =+ sampleCount;
+ minimum=Math.min(newValue, minimum);
+ maximum=Math.max(newValue, maximum);
+ double currentVal = newValue;
+ sum += currentVal;
+ sumOfSquares += currentVal * currentVal;
+ // Calculate each time, as likely to be called for each add
+ mean = sum / count;
+ deviation = Math.sqrt((sumOfSquares / count) - (mean * mean));
+ }
+
public void addBytes(long newValue) {
bytes += newValue;
@@ -92,18 +98,18 @@
private long startTime = 0;
private long elapsedTime = 0;
- public void addSample(long _bytes, long _elapsed, boolean _isSuccess, long _startTime, long _endTime) {
- addBytes(_bytes);
- addValue(_elapsed);
- if (!_isSuccess) errors++;
+ public void addSample(SampleResult res) {
+ addBytes(res.getBytes());
+ addValue(res.getTime(),res.getSampleCount());
+ if (!res.isSuccessful()) errors++;
if (startTime == 0){
- startTime=_startTime;
+ startTime=res.getStartTime();
}
- elapsedTime=_endTime-startTime;
+ elapsedTime=res.getEndTime()-startTime;
}
- public long getTotalBytes() {
+ public long getTotalBytes() {
return bytes;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org