Changeset 11166 for stable/HeuristicLab.Random

Timestamp:

07/09/14 20:07:51 (10 years ago)

Author:

ascheibe

Message:

#2210 merged missing r10646 and r10503 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Random/3.3/RandomEnumerable.cs (modified) (3 diffs)

stable/HeuristicLab.Random/3.3/RandomEnumerable.cs

@@ -183 +183 @@
     private static IEnumerable<T> SampleProportional<T>(this IEnumerable<T> source, IRandom random, IEnumerable<double> weights, bool windowing, bool inverseProportional) {
       var sourceArray = source.ToArray();
-      var valueArray = PrepareProportional(sourceArray, weights, windowing, inverseProportional);
+      var valueArray = PrepareProportional(weights, windowing, inverseProportional);
       double total = valueArray.Sum();
 
@@ -195 +195 @@
     }
     private static IEnumerable<T> SampleProportionalWithoutRepetition<T>(this IEnumerable<T> source, IRandom random, IEnumerable<double> weights, bool windowing, bool inverseProportional) {
-      var valueArray = PrepareProportional(source.ToArray(), weights, windowing, inverseProportional);
+      var valueArray = PrepareProportional(weights, windowing, inverseProportional);
       var list = new LinkedList<Tuple<T, double>>(source.Zip(valueArray, Tuple.Create));
       double total = valueArray.Sum();
 
-      while (list.Count > 0) {        
-        var cur = list.First;        
+      while (list.Count > 0) {
+        var cur = list.First;
         double ball = cur.Value.Item2, sum = random.NextDouble() * total; // assert: sum < total. When there is only one item remaining: sum < ball
         while (ball < sum) {
@@ -212 +212 @@
     }
 
-    private static double[] PrepareProportional<T>(IList<T> sourceArray, IEnumerable<double> weights, bool windowing, bool inverseProportional) {
+    private static double[] PrepareProportional(IEnumerable<double> weights, bool windowing, bool inverseProportional) {
       double maxValue = double.MinValue, minValue = double.MaxValue;
-      double[] valueArray = new double[sourceArray.Count];
-
-      var weightsEnum = weights.GetEnumerator();
-      for (int i = 0; i < sourceArray.Count && weightsEnum.MoveNext(); i++) {
-        valueArray[i] = weightsEnum.Current;
+      double[] valueArray = weights.ToArray();
+
+      for (int i = 0; i < valueArray.Length; i++) {
         if (valueArray[i] > maxValue) maxValue = valueArray[i];
         if (valueArray[i] < minValue) minValue = valueArray[i];
       }
       if (minValue == maxValue) {  // all values are equal
-        for (int i = 0; i < sourceArray.Count; i++) {
+        for (int i = 0; i < valueArray.Length; i++) {
           valueArray[i] = 1.0;
         }