[Swift-commit] cog r4030

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r4030 | hategan | 2014-07-24 14:39:46 -0500 (Thu, 24 Jul 2014) | 1 line

fixed some score calculations
------------------------------------------------------------------------
Index: modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java	(revision 4029)
+++ modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java	(working copy)
@@ -205,7 +205,7 @@
 	}
 
 	public static double jobThrottleFromMaxParallelism(double max) {
-		return max - 1;
+		return (max - 1) / T;
 	}
 
 	public static double initialScoreFromInitialParallelism(double initial, double max) {
@@ -213,14 +213,14 @@
 			throw new IllegalArgumentException("initialParallelJobs cannot be greater than maxParallelJobs");
         }
         // jobThrottle * tscore + 1 = initial
-        // (max - 1) * tscore + 1 = initial;
-        // tscore = (initial - 1) / (max - 1)
+        // (max - 1) * tscore / T + 1 = initial;
+        // tscore = T * (initial - 1) / (max - 1)
         double score;
         if (max == 1) {
             return 0;
         }
         else {
-            double tscore = (initial - 1) / (max - 1);
+            double tscore = T * (initial - 1) / (max - 1);
             // tscore = exp(B * Math.atan(C * score));
             // ln(tscore) = B * atan(C * score)
             // tan(ln(tscore) / B) = C * score