Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6294


Ignore:
Timestamp:
05/26/11 10:32:27 (14 years ago)
Author:
jhelm
Message:

#1329: Did some heavy refactoring after "code-review meeting". Added Encodings.SchedulingEncoding plugin to store encodings used in scheduling problems.

Location:
branches/Scheduling
Files:
61 added
9 edited

Legend:

Unmodified
Added
Removed

  • branches/Scheduling/HeuristicLab 3.3.sln

    r6121 r6294  
    400400EndProject
    401401Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Scheduling.Views-3.3", "HeuristicLab.Problems.Scheduling.Views\3.3\HeuristicLab.Problems.Scheduling.Views-3.3.csproj", "{78763A4E-E163-48C2-98EB-709760D06F25}"
     402EndProject
     403Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SchedulingEncoding-3.3", "HeuristicLab.Encodings.SchedulingEncoding\3.3\HeuristicLab.Encodings.SchedulingEncoding-3.3.csproj", "{17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}"
    402404EndProject
    403405Global
    … …  
    18701872    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|x64.ActiveCfg = Release|Any CPU
    18711873    {78763A4E-E163-48C2-98EB-709760D06F25}.Release|x86.ActiveCfg = Release|Any CPU
     1874    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1875    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1876    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Debug|x64.ActiveCfg = Debug|Any CPU
     1877    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Debug|x86.ActiveCfg = Debug|Any CPU
     1878    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1879    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Release|Any CPU.Build.0 = Release|Any CPU
     1880    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Release|x64.ActiveCfg = Release|Any CPU
     1881    {17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}.Release|x86.ActiveCfg = Release|Any CPU
    18721882  EndGlobalSection
    18731883  GlobalSection(SolutionProperties) = preSolution

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/HeuristicLab.Problems.Scheduling.Views-3.3.csproj

    r6260 r6294  
    7474      <DependentUpon>JobShopSchedulingProblemView.cs</DependentUpon>
    7575    </Compile>
    76     <Compile Include="JSMEncodingView.cs">
    77       <SubType>UserControl</SubType>
    78     </Compile>
    79     <Compile Include="JSMEncodingView.Designer.cs">
    80       <DependentUpon>JSMEncodingView.cs</DependentUpon>
    81     </Compile>
    82     <Compile Include="JSSPJobView.cs">
    83       <SubType>UserControl</SubType>
    84     </Compile>
    85     <Compile Include="JSSPJobView.Designer.cs">
    86       <DependentUpon>JSSPJobView.cs</DependentUpon>
    87     </Compile>
    8876    <Compile Include="Plugin.cs" />
    8977    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    139127      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    140128    </ProjectReference>
     129    <ProjectReference Include="..\..\HeuristicLab.Encodings.SchedulingEncoding\3.3\HeuristicLab.Encodings.SchedulingEncoding-3.3.csproj">
     130      <Project>{17F3EF80-B2C3-4B8D-A4D5-BE9CE3BA2606}</Project>
     131      <Name>HeuristicLab.Encodings.SchedulingEncoding-3.3</Name>
     132    </ProjectReference>
    141133    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    142134      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    … …  
    194186    <EmbeddedResource Include="JobShopSchedulingProblemView.resx">
    195187      <DependentUpon>JobShopSchedulingProblemView.cs</DependentUpon>
    196     </EmbeddedResource>
    197     <EmbeddedResource Include="JSMEncodingView.resx">
    198       <DependentUpon>JSMEncodingView.cs</DependentUpon>
    199188    </EmbeddedResource>
    200189    <EmbeddedResource Include="ScheduleView.resx">

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/JSMEncodingView.cs

    r6266 r6294  
    3232using HeuristicLab.Core;
    3333using HeuristicLab.Encodings.PermutationEncoding;
    34 using HeuristicLab.Problems.Scheduling.Encodings.JobShopScheduling.JobSequenceMatrix;
     34using HeuristicLab.Encodings.SchedulingEncoding.JobSequenceMatrix;
    3535
    3636namespace HeuristicLab.Problems.Scheduling.Views {

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/JobShopSchedulingProblemView.cs

    r6260 r6294  
    6060      int jobCount = 0;
    6161      Random random = new Random(1);
    62       foreach (JSSPJob j in content.Jobs) {
    63         foreach (JSSPTask t in content.Jobs[jobCount].Tasks) {
     62      foreach (Job j in content.JobData) {
     63        double lastEndTime = 0;
     64        foreach (Task t in content.JobData[jobCount].Tasks) {
    6465          int categoryNr = t.JobNr.Value;
    6566          string categoryName = "Job" + categoryNr;
    … …  
    6768          ganttChart.AddData(categoryName,
    6869            categoryNr,
    69             t.StartTime.Value,
    70             t.EndTime.Value,
     70            lastEndTime + 1,
     71            lastEndTime + t.Duration.Value,
    7172            "Job" + t.JobNr + " - " + "Task#" + t.TaskNr.Value.ToString());
     73          lastEndTime += t.Duration.Value;
    7274        }
    7375        jobCount++;

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/Plugin.cs

    r6266 r6294  
    2323
    2424namespace HeuristicLab.Problems.Scheduling.Views {
    25   [Plugin("HeuristicLab.Problems.Scheduling.Views", "3.3.3.6260")]
     25  [Plugin("HeuristicLab.Problems.Scheduling.Views", "3.3.3.6266")]
    2626  [PluginFile("HeuristicLab.Problems.Scheduling.Views-3.3.dll", PluginFileType.Assembly)]
    2727  public class HeuristicLabProblemsSchedulingViewsPlugin : PluginBase {

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/Properties/AssemblyInfo.cs

    r6266 r6294  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.0.6260")]
     55[assembly: AssemblyFileVersion("3.3.0.6266")]

  • branches/Scheduling/HeuristicLab.Problems.Scheduling.Views/3.3/ScheduleView.cs

    r6260 r6294  
    3131using HeuristicLab.MainForm;
    3232using HeuristicLab.Core;
     33using HeuristicLab.Encodings.SchedulingEncoding;
    3334
    3435namespace HeuristicLab.Problems.Scheduling.Views {
    … …  
    7778      Random random = new Random (1);
    7879      foreach (Resource r in content.Resources) {
    79         foreach (JSSPTask t in content.Resources[resCount].Tasks) {
    80           int categoryNr = 0;     
    81           string toolTip = "Task#" + t.TaskNr;
     80        foreach (ScheduledTask t in content.Resources[resCount].Tasks) {
     81          int categoryNr = 0;
     82          string toolTip = "Task#";// +t.TaskNr;
    8283          string categoryName = "ScheduleTasks";
    83           if (t is JSSPTask) {
    84             categoryNr = ((JSSPTask)t).JobNr.Value;
     84          if (t is ScheduledTask) {
     85            categoryNr = ((ScheduledTask)t).JobNr.Value;
    8586            categoryName = "Job" + categoryNr;
    8687            toolTip = categoryName + " - " + toolTip;

  • branches/Scheduling/HeuristicLab/3.3/Files.txt

    r6121 r6294  
    3232HeuristicLab.Encodings.IntegerVectorEncoding\3.3:HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll
    3333HeuristicLab.Encodings.PermutationEncoding\3.3:HeuristicLab.Encodings.PermutationEncoding-3.3.dll
     34HeuristicLab.Encodings.SchedulingEncoding\3.3:HeuristicLab.Encodings.SchedulingEncoding-3.3.dll
    3435HeuristicLab.Encodings.PermutationEncoding.Views\3.3:HeuristicLab.Encodings.PermutationEncoding.Views-3.3.dll
    3536HeuristicLab.Encodings.RealVectorEncoding\3.3:HeuristicLab.Encodings.RealVectorEncoding-3.3.dll

  • branches/Scheduling/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

    r6036 r6294  
    500500      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
    501501    </ProjectReference>
     502    <ProjectReference Include="..\..\..\HeuristicLab.Problems.Scheduling.Views\3.3\HeuristicLab.Problems.Scheduling.Views-3.3.csproj">
     503      <Project>{78763A4E-E163-48C2-98EB-709760D06F25}</Project>
     504      <Name>HeuristicLab.Problems.Scheduling.Views-3.3</Name>
     505    </ProjectReference>
     506    <ProjectReference Include="..\..\..\HeuristicLab.Problems.Scheduling\3.3\HeuristicLab.Problems.Scheduling-3.3.csproj">
     507      <Project>{2BF1D639-1A74-44ED-AAAD-41ECD395AD93}</Project>
     508      <Name>HeuristicLab.Problems.Scheduling-3.3</Name>
     509    </ProjectReference>
    502510    <ProjectReference Include="..\..\..\HeuristicLab.Problems.TestFunctions.Views\3.3\HeuristicLab.Problems.TestFunctions.Views-3.3.csproj">
    503511      <Project>{6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}</Project>
Note: See TracChangeset for help on using the changeset viewer.