Context Navigation

Changeset 10474 for trunk/sources

Timestamp:

02/20/14 13:15:22 (10 years ago)

Author:

gkronber

Message:

#2119: using RandomEnumerable.SampleProportional in BiasedMultiVRPOperators.

Location:

trunk/sources

Files:

trunk/sources/HeuristicLab.HLScript.Views/3.3
- Property svn:ignore set to
  obj
  Plugin.cs
trunk/sources/HeuristicLab.HLScript.Views/3.3/Properties
- Property svn:ignore set to
  AssemblyInfo.cs

Property svn:ignore

old	new
1	1	VariableStoreSerializer.cs
	2	obj
	3	Plugin.cs

trunk/sources/HeuristicLab.HLScript/3.3/Properties
- Property svn:ignore set to
  AssemblyInfo.cs

-                      r10472
+                      r10474
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
 …
       if (checkedOperators.Count() > 0) {
         // select a random operator from the checked operators
+        double sum = (from indexedItem in checkedOperators select probabilities[indexedItem.Index]).Sum();
+        if (sum == 0) throw new InvalidOperationException(Name + ": All selected operators have zero probability.");
+        double r = random.NextDouble() * sum;
+        sum = 0;
+        foreach (var indexedItem in checkedOperators) {
+          sum += probabilities[indexedItem.Index];
+          if (sum > r) {
+            successor = indexedItem.Value;
+            break;
+          }
+        }
+        successor = checkedOperators.SampleProportional(random, 1, probabilities, false, false).First().Value;
+      }

-                      r10472
+                      r10474
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
 …
       if (checkedOperators.Count() > 0) {
         // select a random operator from the checked operators
+        double sum = (from indexedItem in checkedOperators select probabilities[indexedItem.Index]).Sum();
+        if (sum == 0) throw new InvalidOperationException(Name + ": All selected operators have zero probability.");
+        double r = random.NextDouble() * sum;
+        sum = 0;
+        foreach (var indexedItem in checkedOperators) {
+          sum += probabilities[indexedItem.Index];
+          if (sum > r) {
+            successor = indexedItem.Value;
+            break;
+          }
+        }
+        successor =
+          checkedOperators.SampleProportional(random, 1, probabilities, false, false).First().Value;
+      }

-                      r8894
+                      r10474
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
+      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
+      <Name>HeuristicLab.Random-3.3</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

r10037	r10474
41	41	[PluginDependency("HeuristicLab.Persistence", "3.3")]
42	42	[PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
	43	[PluginDependency("HeuristicLab.Random", "3.3")]
43	44	public class HeuristicLabProblemsVehicleRoutingPlugin : PluginBase {
44	45	}

Note: See TracChangeset for help on using the changeset viewer.