You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/12 12:28:56 UTC
stratos git commit: remove unused margin values from load average and
memory consumption
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 524b2ec5d -> 1f6732137
remove unused margin values from load average and memory consumption
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1f673213
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1f673213
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1f673213
Branch: refs/heads/4.1.0-test
Commit: 1f67321378d922507dd1978c535e24f62ed9fa23
Parents: 524b2ec
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Dec 12 17:00:52 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Dec 12 17:00:52 2014 +0530
----------------------------------------------------------------------
.../pojo/policy/autoscale/LoadAverage.java | 36 ++-----------------
.../policy/autoscale/MemoryConsumption.java | 38 ++------------------
2 files changed, 4 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1f673213/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverage.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverage.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverage.java
index ee72f62..7b723c6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverage.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/LoadAverage.java
@@ -30,8 +30,6 @@ public class LoadAverage implements Serializable{
private float average = 0.0f;
private float secondDerivative = 0.0f;
private float gradient = 0.0f;
- private float scaleDownMarginOfGradient = 0.0f;
- private float scaleDownMarginOfSecondDerivative = 0.0f;
/**
* Gets the value of the average property.
@@ -76,39 +74,9 @@ public class LoadAverage implements Serializable{
this.gradient = value;
}
- /**
- * Gets the value of the scaleDownSlowerMarginOfGradient property.
- */
- public float getScaleDownMarginOfGradient() {
- return scaleDownMarginOfGradient;
- }
-
- /**
- * Sets the value of the scaleDownSlowerMarginOfGradient property.
- *
- */
- public void setScaleDownMarginOfGradient(float scaleDownMarginOfGradient) {
- this.scaleDownMarginOfGradient = scaleDownMarginOfGradient;
- }
-
- /**
- * Gets the value of the scaleDownSlowerMarginOfSecondDerivative property.
- */
- public float getScaleDownMarginOfSecondDerivative() {
- return scaleDownMarginOfSecondDerivative;
- }
-
- /**
- * Sets the value of the scaleDownSlowerMarginOfSecondDerivative property.
- *
- */
- public void setScaleDownMarginOfSecondDerivative(float scaleDownMarginOfSecondDerivative) {
- this.scaleDownMarginOfSecondDerivative = scaleDownMarginOfSecondDerivative;
- }
-
@Override
public String toString() {
- return String.format("[average] %f [second-derivative] %f [gradient] %f [scale-down-margin-of-gradient] %f [scale-down-margin-of-second-derivative] %f",
- getAverage(), getSecondDerivative(), getGradient(), getScaleDownMarginOfGradient(), getScaleDownMarginOfSecondDerivative());
+ return String.format("[average] %f [second-derivative] %f [gradient] %f",
+ getAverage(), getSecondDerivative(), getGradient());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/1f673213/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumption.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumption.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumption.java
index ddaf3ef..d072b12 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumption.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/pojo/policy/autoscale/MemoryConsumption.java
@@ -30,9 +30,6 @@ public class MemoryConsumption implements Serializable {
private float average = 0.0f;
private float secondDerivative = 0.0f;
private float gradient = 0.0f;
- private float scaleDownMarginOfGradient = 0.0f;
- private float scaleDownMarginOfSecondDerivative = 0.0f;
-
/**
* Gets the value of the average property.
@@ -77,40 +74,9 @@ public class MemoryConsumption implements Serializable {
this.gradient = value;
}
-
- /**
- * Gets the value of the scaleDownSlowerMarginOfGradient property.
- */
- public float getScaleDownMarginOfGradient() {
- return scaleDownMarginOfGradient;
- }
-
- /**
- * Sets the value of the scaleDownSlowerMarginOfGradient property.
- *
- */
- public void setScaleDownMarginOfGradient(float scaleDownMarginOfGradient) {
- this.scaleDownMarginOfGradient = scaleDownMarginOfGradient;
- }
-
- /**
- * Gets the value of the scaleDownSlowerMarginOfSecondDerivative property.
- */
- public float getScaleDownMarginOfSecondDerivative() {
- return scaleDownMarginOfSecondDerivative;
- }
-
- /**
- * Sets the value of the scaleDownSlowerMarginOfSecondDerivative property.
- *
- */
- public void setScaleDownMarginOfSecondDerivative(float scaleDownMarginOfSecondDerivative) {
- this.scaleDownMarginOfSecondDerivative = scaleDownMarginOfSecondDerivative;
- }
-
@Override
public String toString() {
- return String.format("[average] %f [second-derivative] %f [gradient] %f [scale-down-margin-of-gradient] %f [scale-down-margin-of-second-derivative] %f",
- getAverage(), getSecondDerivative(), getGradient(), getScaleDownMarginOfGradient(), getScaleDownMarginOfSecondDerivative());
+ return String.format("[average] %f [second-derivative] %f [gradient] %f",
+ getAverage(), getSecondDerivative(), getGradient());
}
}
\ No newline at end of file