Changeset 2656


Ignore:
Timestamp:
01/20/10 05:10:22 (10 years ago)
Author:
swagner
Message:

Committing first results of the refactoring of HeuristicLab.Core and related plugins (#95)

Location:
trunk/sources
Files:
1 added
2 deleted
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r2572 r2656  
    1010  EndProjectSection
    1111EndProject
    12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab", "HeuristicLab\HeuristicLab.csproj", "{623FB817-8371-4A9A-A491-4DECC87B2BBB}"
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj", "{94186A6A-5176-4402-AE83-886557B53CCA}"
     13EndProject
     14Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
     15EndProject
     16Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.GUI-3.3", "HeuristicLab.Persistence.GUI\3.3\HeuristicLab.Persistence.GUI-3.3.csproj", "{A9E282EA-180F-4233-B809-AEDF0787545C}"
     17EndProject
     18Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.UnitTest", "HeuristicLab.Persistence\UnitTests\HeuristicLab.Persistence.UnitTest.csproj", "{BF7D9494-A586-457B-8DF9-ED599F9E6A71}"
     19EndProject
     20Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Core-3.3", "HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj", "{C36BD924-A541-4A00-AFA8-41701378DDC5}"
     21EndProject
     22Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
     23EndProject
     24Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators-3.3", "HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj", "{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}"
     25EndProject
     26Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
     27EndProject
     28Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Permutation-3.3", "HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj", "{00282156-589D-424F-9CE4-A8038636C926}"
     29EndProject
     30Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Evolutionary-3.3", "HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj", "{25087811-F74C-4128-BC86-8324271DA13E}"
     31EndProject
     32Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Random-3.3", "HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj", "{F4539FB6-4708-40C9-BE64-0A1390AEA197}"
     33EndProject
     34Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
     35EndProject
     36Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Charting-3.3", "HeuristicLab.Charting\3.3\HeuristicLab.Charting-3.3.csproj", "{A8265018-D687-4907-8A36-63B25967A038}"
     37EndProject
     38Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Routing.TSP-3.3", "HeuristicLab.Routing.TSP\3.3\HeuristicLab.Routing.TSP-3.3.csproj", "{600287A3-8714-453E-B875-A05F3EB72315}"
     39EndProject
     40Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Charting.Data-3.3", "HeuristicLab.Charting.Data\3.3\HeuristicLab.Charting.Data-3.3.csproj", "{EE956A95-6344-4B01-876F-BE95C5E2F92B}"
     41EndProject
     42Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Logging-3.3", "HeuristicLab.Logging\3.3\HeuristicLab.Logging-3.3.csproj", "{72908B54-D136-4BF2-8474-25AA6CB66C92}"
     43EndProject
     44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Programmable-3.3", "HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj", "{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}"
     45EndProject
     46Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection.OffspringSelection-3.3", "HeuristicLab.Selection.OffspringSelection\3.3\HeuristicLab.Selection.OffspringSelection-3.3.csproj", "{81609E8A-9757-4865-8B89-0B6603F769E8}"
     47EndProject
     48Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA-3.3", "HeuristicLab.SGA\3.3\HeuristicLab.SGA-3.3.csproj", "{4C3305C4-E440-4EAD-B218-68D77AE51543}"
     49EndProject
     50Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TestFunctions-3.3", "HeuristicLab.TestFunctions\3.3\HeuristicLab.TestFunctions-3.3.csproj", "{55E23C37-F4F8-4B20-89B3-1B8B59050CE2}"
     51EndProject
     52Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ThreadParallelEngine-3.3", "HeuristicLab.ThreadParallelEngine\3.3\HeuristicLab.ThreadParallelEngine-3.3.csproj", "{C2E99CCE-9FB0-456F-9BA0-57900E4AA799}"
     53EndProject
     54Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab 3.3", "HeuristicLab 3.3\HeuristicLab 3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}"
    1355  ProjectSection(ProjectDependencies) = postProject
    14     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC} = {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}
    15     {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E}
    16     {A8265018-D687-4907-8A36-63B25967A038} = {A8265018-D687-4907-8A36-63B25967A038}
    1756    {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
    1857    {C36BD924-A541-4A00-AFA8-41701378DDC5} = {C36BD924-A541-4A00-AFA8-41701378DDC5}
    19     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6} = {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}
     58    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}
    2059    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
    21     {55E23C37-F4F8-4B20-89B3-1B8B59050CE2} = {55E23C37-F4F8-4B20-89B3-1B8B59050CE2}
    22     {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
    23     {72908B54-D136-4BF2-8474-25AA6CB66C92} = {72908B54-D136-4BF2-8474-25AA6CB66C92}
    24     {00282156-589D-424F-9CE4-A8038636C926} = {00282156-589D-424F-9CE4-A8038636C926}
     60    {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301}
    2561    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A} = {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}
    2662    {C664305E-497C-4533-A140-967DEDB05C19} = {C664305E-497C-4533-A140-967DEDB05C19}
    2763    {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
    28     {81609E8A-9757-4865-8B89-0B6603F769E8} = {81609E8A-9757-4865-8B89-0B6603F769E8}
    2964    {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {BF7D9494-A586-457B-8DF9-ED599F9E6A71}
    30     {EE956A95-6344-4B01-876F-BE95C5E2F92B} = {EE956A95-6344-4B01-876F-BE95C5E2F92B}
    31     {600287A3-8714-453E-B875-A05F3EB72315} = {600287A3-8714-453E-B875-A05F3EB72315}
    32     {F4539FB6-4708-40C9-BE64-0A1390AEA197} = {F4539FB6-4708-40C9-BE64-0A1390AEA197}
     65    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6} = {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}
    3366    {AB687BBE-1BFE-476B-906D-44237135431D} = {AB687BBE-1BFE-476B-906D-44237135431D}
    34     {4C3305C4-E440-4EAD-B218-68D77AE51543} = {4C3305C4-E440-4EAD-B218-68D77AE51543}
    35     {C75532C4-765B-418E-B09B-46D36B2ABDB1} = {C75532C4-765B-418E-B09B-46D36B2ABDB1}
    36     {C2E99CCE-9FB0-456F-9BA0-57900E4AA799} = {C2E99CCE-9FB0-456F-9BA0-57900E4AA799}
    3767    {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B} = {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
    3868    {EE2034D9-6E27-48A1-B855-42D45F69A4FC} = {EE2034D9-6E27-48A1-B855-42D45F69A4FC}
     69    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {1B3063DB-D71C-4A6A-A359-883E8F53A140}
    3970    {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C}
    40     {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
    41     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
    4271    {1FC004FC-59AF-4249-B1B6-FF25873A20E4} = {1FC004FC-59AF-4249-B1B6-FF25873A20E4}
    4372  EndProjectSection
    4473EndProject
    45 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure", "HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj", "{94186A6A-5176-4402-AE83-886557B53CCA}"
    46 EndProject
    47 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastructure.GUI", "HeuristicLab.PluginInfrastructure.GUI\HeuristicLab.PluginInfrastructure.GUI.csproj", "{D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}"
    48 EndProject
    49 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}"
    50 EndProject
    51 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.GUI-3.3", "HeuristicLab.Persistence.GUI\3.3\HeuristicLab.Persistence.GUI-3.3.csproj", "{A9E282EA-180F-4233-B809-AEDF0787545C}"
    52 EndProject
    53 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.UnitTest", "HeuristicLab.Persistence\UnitTests\HeuristicLab.Persistence.UnitTest.csproj", "{BF7D9494-A586-457B-8DF9-ED599F9E6A71}"
    54 EndProject
    55 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Core-3.3", "HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj", "{C36BD924-A541-4A00-AFA8-41701378DDC5}"
    56 EndProject
    57 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}"
    58 EndProject
    59 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators-3.3", "HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj", "{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}"
    60 EndProject
    61 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SequentialEngine-3.3", "HeuristicLab.SequentialEngine\3.3\HeuristicLab.SequentialEngine-3.3.csproj", "{DC3D7072-7999-4719-B65D-3997744D5DC1}"
    62 EndProject
    63 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Permutation-3.3", "HeuristicLab.Permutation\3.3\HeuristicLab.Permutation-3.3.csproj", "{00282156-589D-424F-9CE4-A8038636C926}"
    64 EndProject
    65 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Evolutionary-3.3", "HeuristicLab.Evolutionary\3.3\HeuristicLab.Evolutionary-3.3.csproj", "{25087811-F74C-4128-BC86-8324271DA13E}"
    66 EndProject
    67 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Random-3.3", "HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj", "{F4539FB6-4708-40C9-BE64-0A1390AEA197}"
    68 EndProject
    69 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection-3.3", "HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj", "{2C36CD4F-E5F5-43A4-801A-201EA895FE17}"
    70 EndProject
    71 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Charting-3.3", "HeuristicLab.Charting\3.3\HeuristicLab.Charting-3.3.csproj", "{A8265018-D687-4907-8A36-63B25967A038}"
    72 EndProject
    73 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Routing.TSP-3.3", "HeuristicLab.Routing.TSP\3.3\HeuristicLab.Routing.TSP-3.3.csproj", "{600287A3-8714-453E-B875-A05F3EB72315}"
    74 EndProject
    75 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Charting.Data-3.3", "HeuristicLab.Charting.Data\3.3\HeuristicLab.Charting.Data-3.3.csproj", "{EE956A95-6344-4B01-876F-BE95C5E2F92B}"
    76 EndProject
    77 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Logging-3.3", "HeuristicLab.Logging\3.3\HeuristicLab.Logging-3.3.csproj", "{72908B54-D136-4BF2-8474-25AA6CB66C92}"
    78 EndProject
    79 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Programmable-3.3", "HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj", "{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}"
    80 EndProject
    81 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection.OffspringSelection-3.3", "HeuristicLab.Selection.OffspringSelection\3.3\HeuristicLab.Selection.OffspringSelection-3.3.csproj", "{81609E8A-9757-4865-8B89-0B6603F769E8}"
    82 EndProject
    83 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SGA-3.3", "HeuristicLab.SGA\3.3\HeuristicLab.SGA-3.3.csproj", "{4C3305C4-E440-4EAD-B218-68D77AE51543}"
    84 EndProject
    85 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TestFunctions-3.3", "HeuristicLab.TestFunctions\3.3\HeuristicLab.TestFunctions-3.3.csproj", "{55E23C37-F4F8-4B20-89B3-1B8B59050CE2}"
    86 EndProject
    87 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ThreadParallelEngine-3.3", "HeuristicLab.ThreadParallelEngine\3.3\HeuristicLab.ThreadParallelEngine-3.3.csproj", "{C2E99CCE-9FB0-456F-9BA0-57900E4AA799}"
    88 EndProject
    89 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab 3.3", "HeuristicLab 3.3\HeuristicLab 3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}"
    90 EndProject
    9174Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tracing-3.2", "HeuristicLab.Tracing\3.2\HeuristicLab.Tracing-3.2.csproj", "{EE2034D9-6E27-48A1-B855-42D45F69A4FC}"
    9275EndProject
     
    9578Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Common.Resources-3.2", "HeuristicLab.Common.Resources\3.2\HeuristicLab.Common.Resources-3.2.csproj", "{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}"
    9679EndProject
    97 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "WinFormsUI\WinFormsUI.csproj", "{C75532C4-765B-418E-B09B-46D36B2ABDB1}"
    98 EndProject
    9980Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm-3.2", "HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj", "{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}"
    10081EndProject
    101 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.Test-3.2", "HeuristicLab.MainForm.Test\3.2\HeuristicLab.MainForm.Test-3.2.csproj", "{569E430B-B4CE-4B94-A44E-6246B6E4E3BC}"
    102 EndProject
    10382Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimizer-3.3", "HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj", "{C664305E-497C-4533-A140-967DEDB05C19}"
    10483EndProject
     
    10887EndProject
    10988Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Collections-3.3", "HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj", "{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}"
     89EndProject
     90Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.ExtLibs", "HeuristicLab.ExtLibs", "{07BCBC57-3E15-4582-B306-C046E516C49C}"
     91EndProject
     92Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.WinFormsUI", "HeuristicLab.WinFormsUI", "{7F485A48-A80F-4454-9A9B-7B126B43861C}"
     93EndProject
     94Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.WinFormsUI-2.3.1", "HeuristicLab.WinFormsUI-2.3.1", "{99AD3658-DB36-4E26-B4CC-6FEAACC5C88C}"
     95EndProject
     96Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.WinFormsUI-2.3.1", "HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1\HeuristicLab.WinFormsUI-2.3.1.csproj", "{678E2145-8152-4E19-9646-07D439D00301}"
     97EndProject
     98Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI-2.3.1", "HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1\WinFormsUI-2.3.1.csproj", "{1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}"
     99EndProject
     100Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.log4net-1.2.10.0", "HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0\HeuristicLab.log4net-1.2.10.0.csproj", "{1B3063DB-D71C-4A6A-A359-883E8F53A140}"
     101EndProject
     102Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HeuristicLab.log4net", "HeuristicLab.log4net", "{BA3315A3-9D7C-4F5F-99F4-1C9B88FD32AE}"
    110103EndProject
    111104Global
     
    119112  EndGlobalSection
    120113  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    121     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    122     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
    123     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x64.ActiveCfg = Debug|x64
    124     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x64.Build.0 = Debug|x64
    125     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x86.ActiveCfg = Debug|x86
    126     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Debug|x86.Build.0 = Debug|x86
    127     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
    128     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|Any CPU.Build.0 = Release|Any CPU
    129     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|x64.ActiveCfg = Release|x64
    130     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|x64.Build.0 = Release|x64
    131     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|x86.ActiveCfg = Release|x86
    132     {623FB817-8371-4A9A-A491-4DECC87B2BBB}.Release|x86.Build.0 = Release|x86
    133114    {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    134115    {94186A6A-5176-4402-AE83-886557B53CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    143124    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|x86.ActiveCfg = Release|x86
    144125    {94186A6A-5176-4402-AE83-886557B53CCA}.Release|x86.Build.0 = Release|x86
    145     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    146     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    147     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x64.ActiveCfg = Debug|x64
    148     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x64.Build.0 = Debug|x64
    149     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x86.ActiveCfg = Debug|x86
    150     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Debug|x86.Build.0 = Debug|x86
    151     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    152     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|Any CPU.Build.0 = Release|Any CPU
    153     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|x64.ActiveCfg = Release|x64
    154     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|x64.Build.0 = Release|x64
    155     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|x86.ActiveCfg = Release|x86
    156     {D3F92C1F-42B4-4EFB-9E73-B64FD3428ADE}.Release|x86.Build.0 = Release|x86
    157126    {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    158127    {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    433402    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.ActiveCfg = Release|x86
    434403    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}.Release|x86.Build.0 = Release|x86
    435     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    436     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
    437     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.ActiveCfg = Debug|x64
    438     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.Build.0 = Debug|x64
    439     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.ActiveCfg = Debug|x86
    440     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x86.Build.0 = Debug|x86
    441     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
    442     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU
    443     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.ActiveCfg = Release|x64
    444     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.Build.0 = Release|x64
    445     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|x86
    446     {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.Build.0 = Release|x86
    447404    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    448405    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    457414    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Release|x86.ActiveCfg = Release|x86
    458415    {3BD61258-31DA-4B09-89C0-4F71FEF5F05A}.Release|x86.Build.0 = Release|x86
    459     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    460     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
    461     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.ActiveCfg = Debug|x64
    462     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.Build.0 = Debug|x64
    463     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.ActiveCfg = Debug|x86
    464     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.Build.0 = Debug|x86
    465     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
    466     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.Build.0 = Release|Any CPU
    467     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.ActiveCfg = Release|x64
    468     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.Build.0 = Release|x64
    469     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.ActiveCfg = Release|x86
    470     {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.Build.0 = Release|x86
    471416    {C664305E-497C-4533-A140-967DEDB05C19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    472417    {C664305E-497C-4533-A140-967DEDB05C19}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    505450    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x64.ActiveCfg = Release|Any CPU
    506451    {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}.Release|x86.ActiveCfg = Release|Any CPU
     452    {678E2145-8152-4E19-9646-07D439D00301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     453    {678E2145-8152-4E19-9646-07D439D00301}.Debug|Any CPU.Build.0 = Debug|Any CPU
     454    {678E2145-8152-4E19-9646-07D439D00301}.Debug|x64.ActiveCfg = Debug|x64
     455    {678E2145-8152-4E19-9646-07D439D00301}.Debug|x64.Build.0 = Debug|x64
     456    {678E2145-8152-4E19-9646-07D439D00301}.Debug|x86.ActiveCfg = Debug|x86
     457    {678E2145-8152-4E19-9646-07D439D00301}.Debug|x86.Build.0 = Debug|x86
     458    {678E2145-8152-4E19-9646-07D439D00301}.Release|Any CPU.ActiveCfg = Release|Any CPU
     459    {678E2145-8152-4E19-9646-07D439D00301}.Release|Any CPU.Build.0 = Release|Any CPU
     460    {678E2145-8152-4E19-9646-07D439D00301}.Release|x64.ActiveCfg = Release|x64
     461    {678E2145-8152-4E19-9646-07D439D00301}.Release|x64.Build.0 = Release|x64
     462    {678E2145-8152-4E19-9646-07D439D00301}.Release|x86.ActiveCfg = Release|x86
     463    {678E2145-8152-4E19-9646-07D439D00301}.Release|x86.Build.0 = Release|x86
     464    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     465    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
     466    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x64.ActiveCfg = Debug|x64
     467    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x64.Build.0 = Debug|x64
     468    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x86.ActiveCfg = Debug|x86
     469    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Debug|x86.Build.0 = Debug|x86
     470    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
     471    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|Any CPU.Build.0 = Release|Any CPU
     472    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x64.ActiveCfg = Release|x64
     473    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x64.Build.0 = Release|x64
     474    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x86.ActiveCfg = Release|x86
     475    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB}.Release|x86.Build.0 = Release|x86
     476    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     477    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|Any CPU.Build.0 = Debug|Any CPU
     478    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|x64.ActiveCfg = Debug|x64
     479    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|x64.Build.0 = Debug|x64
     480    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|x86.ActiveCfg = Debug|x86
     481    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Debug|x86.Build.0 = Debug|x86
     482    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|Any CPU.ActiveCfg = Release|Any CPU
     483    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|Any CPU.Build.0 = Release|Any CPU
     484    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x64.ActiveCfg = Release|x64
     485    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x64.Build.0 = Release|x64
     486    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x86.ActiveCfg = Release|x86
     487    {1B3063DB-D71C-4A6A-A359-883E8F53A140}.Release|x86.Build.0 = Release|x86
    507488  EndGlobalSection
    508489  GlobalSection(SolutionProperties) = preSolution
    509490    HideSolutionNode = FALSE
    510491  EndGlobalSection
     492  GlobalSection(NestedProjects) = preSolution
     493    {7F485A48-A80F-4454-9A9B-7B126B43861C} = {07BCBC57-3E15-4582-B306-C046E516C49C}
     494    {BA3315A3-9D7C-4F5F-99F4-1C9B88FD32AE} = {07BCBC57-3E15-4582-B306-C046E516C49C}
     495    {99AD3658-DB36-4E26-B4CC-6FEAACC5C88C} = {7F485A48-A80F-4454-9A9B-7B126B43861C}
     496    {678E2145-8152-4E19-9646-07D439D00301} = {99AD3658-DB36-4E26-B4CC-6FEAACC5C88C}
     497    {1849A92E-DCFC-4E05-BB0A-D7B7A3DAFCFB} = {99AD3658-DB36-4E26-B4CC-6FEAACC5C88C}
     498    {1B3063DB-D71C-4A6A-A359-883E8F53A140} = {BA3315A3-9D7C-4F5F-99F4-1C9B88FD32AE}
     499  EndGlobalSection
    511500EndGlobal
  • trunk/sources/HeuristicLab 3.3/Files.txt

    r2643 r2656  
    1515HeuristicLab.Logging\3.3:HeuristicLab.Logging-3.3.dll
    1616HeuristicLab.MainForm\3.2:HeuristicLab.MainForm-3.2.dll
    17 HeuristicLab.MainForm.Test\3.2:HeuristicLab.MainForm.Test-3.2.dll
    1817HeuristicLab.MainForm.WindowsForms\3.2:HeuristicLab.MainForm.WindowsForms-3.2.dll
    1918HeuristicLab.Operators\3.3:HeuristicLab.Operators-3.3.dll
     
    3231HeuristicLab.ThreadParallelEngine\3.3:HeuristicLab.ThreadParallelEngine-3.3.dll
    3332HeuristicLab.Tracing\3.2:HeuristicLab.Tracing-3.2.dll
    34 HeuristicLab.Tracing\3.2:log4net.dll
    35 HeuristicLab.Tracing\3.2:log4net licence.txt
    3633HeuristicLab.Tracing\3.2:HeuristicLab.log4net.xml
    37 WinFormsUI:WeifenLuo.WinFormsUI.Docking.dll
    38 WinFormsUI:WeifenLuo.WinFormsUI.Docking License.txt
     34
     35;External Libraries
     36HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:HeuristicLab.log4net-1.2.10.0.dll
     37HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:log4net.dll
     38HeuristicLab.ExtLibs\HeuristicLab.log4net\1.2.10.0:log4net License.txt
     39
     40HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking-2.3.1.dll
     41HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:HeuristicLab.WinFormsUI-2.3.1.dll
     42HeuristicLab.ExtLibs\HeuristicLab.WinFormsUI\2.3.1\HeuristicLab.WinFormsUI-2.3.1:WeifenLuo.WinFormsUI.Docking License.txt
  • trunk/sources/HeuristicLab.Common/3.2/EnumerableEventArgs.cs

    r2323 r2656  
    2525
    2626namespace HeuristicLab.Common {
     27  [Obsolete("Use generic event args EventArgs<T> instead of EnumberableEventArgs<T>", false)]
    2728  public class EnumerableEventArgs<T> : EventArgs {
    2829    public EnumerableEventArgs(IEnumerable<T> data) {
  • trunk/sources/HeuristicLab.Common/3.2/NotificationDictionary.cs

    r2346 r2656  
    2828
    2929namespace HeuristicLab.Common {
     30  [Obsolete("Use collections of the HeuristicLab.Collections plugin instead", false)]
    3031  public class NotificationDictionary<TKey, TValue> : IDictionary<TKey, TValue> {
    3132   
  • trunk/sources/HeuristicLab.Common/3.2/ObservableCollection.cs

    r2515 r2656  
    2626
    2727namespace HeuristicLab.Common {
     28  [Obsolete("Use collections of the HeuristicLab.Collections plugin instead", false)]
    2829  public class ObservableCollection<T> : ICollection<T>, INotifyCollectionChanged {
    2930    protected List<T> list;
  • trunk/sources/HeuristicLab.Common/3.2/ObservableList.cs

    r2458 r2656  
    2626
    2727namespace HeuristicLab.Common {
     28  [Obsolete("Use collections of the HeuristicLab.Collections plugin instead", false)]
    2829  public class ObservableList<T> : ObservableCollection<T>, IList<T> {
    2930
  • trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

    r2557 r2656  
    3232    #endregion
    3333
    34     private static Dictionary<IItemView, FileInfo> files;
     34    private static Dictionary<IObjectView, FileInfo> files;
    3535    private static NewItemDialog newItemDialog;
    3636    private static OpenFileDialog openFileDialog;
     
    4040
    4141    static FileManager() {
    42       files = new Dictionary<IItemView, FileInfo>();
     42      files = new Dictionary<IObjectView, FileInfo>();
    4343      newItemDialog = null;
    4444      openFileDialog = null;
     
    5353      if (newItemDialog.ShowDialog() == DialogResult.OK) {
    5454        IView view = MainFormManager.CreateDefaultView(newItemDialog.Item);
    55         if (view is IItemView) {
     55        if (view is IObjectView) {
    5656          view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
    5757          newDocumentsCounter++;
     
    7878
    7979    public static void Save() {
    80       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
    81       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
     80      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
     81      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
    8282        Save(activeView);
    8383      }
    8484    }
    85     private static void Save(IItemView view) {
     85    private static void Save(IObjectView view) {
    8686      if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
    8787        SaveAs(view);
     
    9595
    9696    public static void SaveAs() {
    97       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
    98       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType()))) {
     97      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
     98      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
    9999        SaveAs(activeView);
    100100      }
    101101    }
    102     public static void SaveAs(IItemView view) {
     102    public static void SaveAs(IObjectView view) {
    103103      if (saveFileDialog == null) {
    104104        saveFileDialog = new SaveFileDialog();
     
    131131    public static void SaveAll() {
    132132      var views = from v in MainFormManager.MainForm.Views
    133                   where v is IItemView
    134                   where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
    135                   select v as IItemView;
    136 
    137       foreach (IItemView view in views) {
     133                  where v is IObjectView
     134                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
     135                  select v as IObjectView;
     136
     137      foreach (IObjectView view in views) {
    138138        Save(view);
    139139      }
     
    142142    // NOTE: This event is fired by the main form. It is registered in HeuristicLabOptimizerApplication.
    143143    internal static void ViewClosed(object sender, ViewEventArgs e) {
    144       IItemView view = e.View as IItemView;
    145       files.Remove(view);
     144      IObjectView view = e.View as IObjectView;
     145      if (view != null) files.Remove(view);
    146146    }
    147147
     
    155155    }
    156156
    157     private static void SaveItemAsync(IItemView view, string filename, int compression) {
     157    private static void SaveItemAsync(IObjectView view, string filename, int compression) {
    158158      ThreadPool.QueueUserWorkItem(
    159159        new WaitCallback(
     
    162162              DisableView(view);
    163163              SetWaitingCursor();
    164               XmlGenerator.Serialize(view.Item, filename, compression);
     164              XmlGenerator.Serialize(view.Object, filename, compression);
    165165              Invoke(delegate() {
    166166                view.Caption = Path.GetFileName(filename);
     
    187187              IItem item = (IItem)XmlParser.Deserialize(filename);
    188188              Invoke(delegate() {
    189                 IItemView view = MainFormManager.CreateDefaultView(item) as IItemView;
     189                IObjectView view = MainFormManager.CreateDefaultView(item) as IObjectView;
    190190                if (view != null) {
    191191                  view.Caption = Path.GetFileName(filename);
  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r2547 r2656  
    5454    <Compile Include="MenuItems\CloseMenuItem.cs" />
    5555    <Compile Include="MenuItems\CloseAllMenuItem.cs" />
     56    <Compile Include="MenuItems\OperatorsMenuItem.cs" />
    5657    <Compile Include="MenuItems\SaveAllMenuItem.cs" />
    5758    <Compile Include="MenuItems\SaveAsMenuItem.cs" />
  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerApplication.cs

    r2555 r2656  
    3131
    3232namespace HeuristicLab.Optimizer {
    33   [ClassInfo(Name = "Optimizer 3.3", Description="Next generation heuristic optimization environment.")]
     33  [Application("Optimizer 3.3", "Next generation heuristic optimization environment.")]
    3434  internal class HeuristicLabOptimizerApplication : ApplicationBase {
    3535    public override void Run() {
  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs

    r2546 r2656  
    2626
    2727namespace HeuristicLab.Optimizer {
    28   [ClassInfo(Name = "HeuristicLab.Optimizer-3.3")]
    29   [PluginFile(Filename = "HeuristicLab.Optimizer-3.3.dll", Filetype = PluginFileType.Assembly)]
    30   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
    31   [Dependency(Dependency = "HeuristicLab.Common.Resources-3.2")]
    32   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    33   [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
    34   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
    35   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
     28  [Plugin("HeuristicLab.Optimizer-3.3")]
     29  [PluginFile("HeuristicLab.Optimizer-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Persistence-3.3")]
     31  [PluginDependency("HeuristicLab.Common.Resources-3.2")]
     32  [PluginDependency("HeuristicLab.Core-3.3")]
     33  [PluginDependency("HeuristicLab.Core.Views-3.3")]
     34  [PluginDependency("HeuristicLab.MainForm-3.2")]
     35  [PluginDependency("HeuristicLab.MainForm.WindowsForms-3.2")]
    3636  public class HeuristicLabOptimizerPlugin : PluginBase {
    3737  }
  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

    r2555 r2656  
    3434    public override void ActiveViewChanged(object sender, EventArgs e) {
    3535      var views = from v in MainFormManager.MainForm.Views
    36                   where v is IItemView
    37                   where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
     36                  where v is IObjectView
     37                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
    3838                  select v;
    3939      ToolStripItem.Enabled = views.FirstOrDefault() != null;
  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

    r2546 r2656  
    3333    }
    3434    public override void ActiveViewChanged(object sender, EventArgs e) {
    35       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
    36       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
     35      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
     36      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
    3737    }
    3838
  • trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

    r2546 r2656  
    3636    }
    3737    public override void ActiveViewChanged(object sender, EventArgs e) {
    38       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
    39       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
     38      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
     39      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
    4040    }
    4141
  • trunk/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

    r2546 r2656  
    3232        SetListViewDisplayStyleCheckBoxes();
    3333
    34         DiscoveryService ds = new DiscoveryService();
    35         var categories = from t in ds.GetTypes(typeof(IItem))
     34        var categories = from t in ApplicationManager.Manager.GetTypes(typeof(IItem))
    3635                         where CreatableAttribute.IsCreatable(t)
    3736                         orderby CreatableAttribute.GetCategory(t), ItemAttribute.GetName(t) ascending
     
    4645            IItem i = (IItem)Activator.CreateInstance(creatable);
    4746            items.Add(i);
    48             ListViewItem item = new ListViewItem(new string[] { i.Name, i.Description}, group);
    49             itemsListView.SmallImageList.Images.Add(i.Image);
     47            ListViewItem item = new ListViewItem(new string[] { i.ItemName, i.ItemDescription}, group);
     48            itemsListView.SmallImageList.Images.Add(i.ItemImage);
    5049            item.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
    5150            item.Tag = i;
  • trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.Designer.cs

    r2547 r2656  
    3030      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    3131      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    32       this.ClientSize = new System.Drawing.Size(784, 564);
     32      this.ClientSize = new System.Drawing.Size(984, 714);
    3333      this.Name = "OptimizerMainForm";
    3434      this.Text = "HeuristicLab Optimizer";
  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

    r2555 r2656  
    3131    public override void ActiveViewChanged(object sender, EventArgs e) {
    3232      var views = from v in MainFormManager.MainForm.Views
    33                   where v is IItemView
    34                   where CreatableAttribute.IsCreatable(((IItemView)v).Item.GetType())
     33                  where v is IObjectView
     34                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
    3535                  select v;
    3636      ToolStripItem.Enabled = views.FirstOrDefault() != null;
  • trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

    r2546 r2656  
    3030    }
    3131    public override void ActiveViewChanged(object sender, EventArgs e) {
    32       IItemView activeView = MainFormManager.MainForm.ActiveView as IItemView;
    33       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Item.GetType())));
     32      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
     33      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
    3434    }
    3535
  • trunk/sources/HeuristicLab.Persistence.GUI/3.3/HeuristicLabPersistenceGUIPlugin.cs

    r1534 r2656  
    44namespace HeuristicLab.Persistence.GUI {
    55
    6   [ClassInfo(Name = "HeuristicLab.Persistence.GUI-3.3")]
    7   [PluginFile(Filename = "HeuristicLab.Persistence.GUI-3.3.dll", Filetype = PluginFileType.Assembly)]
    8   [Dependency(Dependency = "HeuristicLab.Persistence-3.3")]
     6  [Plugin("HeuristicLab.Persistence.GUI-3.3")]
     7  [PluginFile("HeuristicLab.Persistence.GUI-3.3.dll", PluginFileType.Assembly)]
     8  [PluginDependency("HeuristicLab.Persistence-3.3")]
    99  public class HeuristicLabPersistencePlugin : PluginBase { }
    1010
    1111
    12   [ClassInfo(Name = "Persistence Configuration")]
     12  [Application("Persistence Configuration")]
    1313  public class HeuristicLabPersistenceApplication : ApplicationBase {
    1414    public override void Run() {
  • trunk/sources/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.frame

    r1526 r2656  
    2323using System.Runtime.CompilerServices;
    2424using System.Runtime.InteropServices;
     25using HeuristicLab.PluginInfrastructure;
    2526
    2627// General Information about an assembly is controlled through the following
     
    5354[assembly: AssemblyVersion("3.3.0.$WCREV$")]
    5455[assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     56[assembly: AssemblyBuildDate("$WCNOW$")]
  • trunk/sources/HeuristicLab.Persistence/3.3/HeuristicLabPersistencePlugin.cs

    r1566 r2656  
    33namespace HeuristicLab.Persistence {
    44
    5   [ClassInfo(Name = "HeuristicLab.Persistence-3.3")]
    6   [PluginFile(Filename = "HeuristicLab.Persistence-3.3.dll", Filetype = PluginFileType.Assembly)]
    7   [Dependency(Dependency = "HeuristicLab.Tracing-3.2")]
     5  [Plugin("HeuristicLab.Persistence-3.3")]
     6  [PluginFile("HeuristicLab.Persistence-3.3.dll", PluginFileType.Assembly)]
     7  [PluginDependency("HeuristicLab.Tracing-3.2")]
    88  public class HeuristicLabPersistencePlugin : PluginBase { }
    99
  • trunk/sources/HeuristicLab.Persistence/3.3/Properties/AssemblyInfo.frame

    r1526 r2656  
    2323using System.Runtime.CompilerServices;
    2424using System.Runtime.InteropServices;
     25using HeuristicLab.PluginInfrastructure;
    2526
    2627// General Information about an assembly is controlled through the following
     
    5354[assembly: AssemblyVersion("3.3.0.$WCREV$")]
    5455[assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     56[assembly: AssemblyBuildDate("$WCNOW$")]
  • trunk/sources/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj

    r2546 r2656  
    7878    </Reference>
    7979    <Reference Include="System.Data" />
    80     <Reference Include="System.Drawing" />
    81     <Reference Include="System.Windows.Forms" />
    8280    <Reference Include="System.Xml" />
    8381  </ItemGroup>
     
    8684    <Compile Include="Properties\AssemblyInfo.cs" />
    8785    <Compile Include="SequentialEngine.cs" />
    88     <Compile Include="SequentialEngineView.cs">
    89       <SubType>UserControl</SubType>
    90     </Compile>
    91     <Compile Include="SequentialEngineView.Designer.cs">
    92       <DependentUpon>SequentialEngineView.cs</DependentUpon>
    93     </Compile>
    9486  </ItemGroup>
    9587  <ItemGroup>
     
    9890  </ItemGroup>
    9991  <ItemGroup>
    100     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    101       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    102       <Name>HeuristicLab.Core.Views-3.3</Name>
    103     </ProjectReference>
    10492    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    10593      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    10694      <Name>HeuristicLab.Core-3.3</Name>
    107     </ProjectReference>
    108     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.2\HeuristicLab.MainForm.WindowsForms-3.2.csproj">
    109       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    110       <Name>HeuristicLab.MainForm.WindowsForms-3.2</Name>
    111     </ProjectReference>
    112     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.2\HeuristicLab.MainForm-3.2.csproj">
    113       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    114       <Name>HeuristicLab.MainForm-3.2</Name>
    11595    </ProjectReference>
    11696    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
  • trunk/sources/HeuristicLab.SequentialEngine/3.3/HeuristicLabSequentialEnginePlugin.cs

    r2520 r2656  
    2929  /// Plugin class for HeuristicLab.SequentialEngine plugin.
    3030  /// </summary>
    31   [ClassInfo(Name = "HeuristicLab.SequentialEngine-3.3")]
    32   [PluginFile(Filename = "HeuristicLab.SequentialEngine-3.3.dll", Filetype = PluginFileType.Assembly)]
    33   [Dependency(Dependency = "HeuristicLab.Core-3.3")]
    34   [Dependency(Dependency = "HeuristicLab.Core.Views-3.3")]
    35   [Dependency(Dependency = "HeuristicLab.MainForm-3.2")]
    36   [Dependency(Dependency = "HeuristicLab.MainForm.WindowsForms-3.2")]
     31  [Plugin("HeuristicLab.SequentialEngine-3.3")]
     32  [PluginFile("HeuristicLab.SequentialEngine-3.3.dll", PluginFileType.Assembly)]
     33  [PluginDependency("HeuristicLab.Persistence-3.3")]
     34  [PluginDependency("HeuristicLab.Core-3.3")]
    3735  public class HeuristicLabSequentialEnginePlugin : PluginBase {
    3836  }
  • trunk/sources/HeuristicLab.SequentialEngine/3.3/SequentialEngine.cs

    r2546 r2656  
    2424using System.Text;
    2525using HeuristicLab.Core;
    26 using System.Threading;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2827
     
    4342    /// <remarks>Calls <see cref="EngineBase.Abort"/> of base class <see cref="EngineBase"/> and
    4443    /// <see cref="IOperator.Abort"/> of the current <see cref="IOperator"/>.</remarks>
    45     public override void Abort() {
    46       base.Abort();
     44    public override void Stop() {
     45      base.Stop();
    4746      if (currentOperator != null)
    4847        currentOperator.Abort();
     
    5655    /// is pushed on the stack again.<br/>
    5756    /// If the execution was successful <see cref="EngineBase.OnOperationExecuted"/> is called.</remarks>
    58     protected override void ProcessNextOperation() {
    59       IOperation operation = myExecutionStack.Pop();
    60       if (operation is AtomicOperation) {
    61         AtomicOperation atomicOperation = (AtomicOperation)operation;
    62         IOperation next = null;
    63         try {
    64           currentOperator = atomicOperation.Operator;
    65           next = atomicOperation.Operator.Execute(atomicOperation.Scope);
    66         }
    67         catch (Exception ex) {
    68           // push operation on stack again
    69           myExecutionStack.Push(atomicOperation);
    70           Abort();
    71           ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex);});
    72         }
    73         if (next != null)
    74           myExecutionStack.Push(next);
    75         OnOperationExecuted(atomicOperation);
    76         if (atomicOperation.Operator.Breakpoint) Abort();
    77       } else if (operation is CompositeOperation) {
    78         CompositeOperation compositeOperation = (CompositeOperation)operation;
    79         for (int i = compositeOperation.Operations.Count - 1; i >= 0; i--)
    80           myExecutionStack.Push(compositeOperation.Operations[i]);
     57    protected override void ProcessNextOperator() {
     58      currentOperator = null;
     59      ExecutionContext context = ExecutionStack.Pop();
     60      ExecutionContextCollection next = null;
     61      try {
     62        currentOperator = context.Operator;
     63        next = context.Operator.Execute(context);
     64        currentOperator = null;
    8165      }
     66      catch (Exception ex) {
     67        ExecutionStack.Push(context);
     68        Stop();
     69        OnExceptionOccurred(ex);
     70      }
     71      if (next != null) {
     72        for (int i = next.Count - 1; i >= 0; i--)
     73          ExecutionStack.Push(next[i]);
     74      }
     75      if (context.Operator.Breakpoint)
     76        Stop();
    8277    }
    8378  }
Note: See TracChangeset for help on using the changeset viewer.