Author: sebb
Date: Wed Nov 14 07:43:35 2007
New Revision: 594919
URL: http://svn.apache.org/viewvc?rev=594919&view=rev
Log:
Sort out some ambiguous names; deprecate the old names
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=594919&r1=594918&r2=594919&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Wed
Nov 14 07:43:35 2007
@@ -170,9 +170,25 @@
* calculates the average page size, which means divide the bytes by number
* of samples.
*
+ * This is an ambiguous name, so:
+ * @deprecated use getAvgPageBytes() instead.
+ *
* @return average page size
*/
public double getPageSize() {
+ if (count > 0 && bytes > 0) {
+ return (double) bytes / count;
+ }
+ return 0.0;
+ }
+
+ /**
+ * calculates the average page size, which means divide the bytes by number
+ * of samples.
+ *
+ * @return average page size in bytes
+ */
+ public double getAvgPageBytes() {
if (count > 0 && bytes > 0) {
return (double) bytes / count;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=594919&r1=594918&r2=594919&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Wed Nov 14 07:43:35 2007
@@ -138,11 +138,53 @@
* Should calculate the average page size, which means divide the bytes
by number
* of samples - actually calculates the throughput in bytes / second
*
- * TODO - fix the name and comment
- *
- * @return
+ * @deprecated use getBytesPerSecond() instead
+ * @see #getAvgPageBytes() for the average page size
*/
public double getPageSize() {
+ double rate = 0;
+ if (this.getElapsed() > 0 && calculator.getTotalBytes() > 0) {
+ rate = calculator.getTotalBytes() / ((double)
this.getElapsed() / 1000);
+ }
+ if (rate < 0) {
+ rate = 0;
+ }
+ return rate;
+ }
+
+ /**
+ * Throughput in bytes / second
+ *
+ * @return throughput in bytes/second
+ */
+ public double getBytesPerSecond() {
+ // Code duplicated from getPageSize()
+ double rate = 0;
+ if (this.getElapsed() > 0 && calculator.getTotalBytes() > 0) {
+ rate = calculator.getTotalBytes() / ((double)
this.getElapsed() / 1000);
+ }
+ if (rate < 0) {
+ rate = 0;
+ }
+ return rate;
+ }
+
+ /**
+ * Throughput in kilobytes / second
+ *
+ * @return Throughput in kilobytes / second
+ */
+ public double getKBPerSecond() {
+ return getBytesPerSecond() / 1024; // 1024=bytes per kb
+ }
+
+ /**
+ * calculates the average page size, which means divide the bytes by number
+ * of samples.
+ *
+ * @return average page size in bytes
+ */
+ public double getAvgPageBytes() {
double rate = 0;
if (this.getElapsed() > 0 && calculator.getTotalBytes() > 0) {
rate = calculator.getTotalBytes() / ((double)
this.getElapsed() / 1000);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
