static variables now actually work...we don't want static variables here i think...

diff --git a/Robust/src/Benchmarks/oooJava/power/Demand.java b/Robust/src/Benchmarks/oooJava/power/Demand.java
index f6b369d0ec883f0882c838b074a3646497314ea3..fdaf3b4a98b07df70ca919475705630e069d4976 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/Demand.java
+++ b/Robust/src/Benchmarks/oooJava/power/Demand.java
@@ -11,9 +11,9 @@ final class Demand {
         **/
        public double Q;
 
-       private static double F_EPSILON;
-       private static double G_EPSILON;
-       private static double H_EPSILON;
+       private double F_EPSILON;
+       private double G_EPSILON;
+       private double H_EPSILON;
 
        /**
         * Create an object that represents power demand and initialize the power

diff --git a/Robust/src/Benchmarks/oooJava/power/Root.java b/Robust/src/Benchmarks/oooJava/power/Root.java
index 6e9a08db1d146c58a549389be42d4b132184a75e..eaff769cb431566e58257472ca98fedc72f3401f 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/power/Root.java
+++ b/Robust/src/Benchmarks/oooJava/power/Root.java
@@ -41,25 +41,25 @@ final class Root {
        /**
         * Value used to compute convergence
         **/
-       private static double ROOT_EPSILON;
+       private double ROOT_EPSILON;
 
        /**
         * Domain of thetaR->P map is 0.65 to 1.00 [index*0.01+0.65]
         **/
-       private static double map_P[];
+       private double map_P[];
 
-       private static double MIN_THETA_R;
-       private static double PER_INDEX_R;
-       private static double MAX_THETA_R;
+       private double MIN_THETA_R;
+       private double PER_INDEX_R;
+       private double MAX_THETA_R;
 
        /**
         * Domain of thetaI->Q map is 0.130 to 0.200 [index*0.002+0.130]
         **/
-       private static double map_Q[];
+       private double map_Q[];
 
-       private static double MIN_THETA_I;
-       private static double PER_INDEX_I;
-       private static double MAX_THETA_I;
+       private double MIN_THETA_I;
+       private double PER_INDEX_I;
+       private double MAX_THETA_I;
        
        /**
         * Create the tree used by the power system optimization benchmark. Each