Changeset 2195

Timestamp:

07/28/09 15:43:24 (15 years ago)

Author:

gkronber

Message:

Fixed compile errors #712.

Location:

branches/HeuristicLab.Modeling Database Backend/sources

Files:

• HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj (modified) (2 diffs)
• HeuristicLab.CEDMA.Server/3.3/Problem.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/ProblemView.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Server/3.3/Server.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Server/3.3/ServerApplication.cs (modified) (1 diff)
• HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs (modified) (2 diffs)
• HeuristicLab.SQLServerCompact/3.2/Properties/AssemblyInfo.cs (modified) (1 diff)

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs

@@ -105 +105 @@
 
     public IView CreateView() {
-      return new ProblemView(this);
+      return new DispatcherView(this);
     }
 

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs

@@ -39 +39 @@
 using System.Threading;
 using HeuristicLab.Modeling;
-using HeuristicLab.Modeling.SQLServerCompactBackend;
+using HeuristicLab.Modeling.Database;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -74 +74 @@
 
     protected void SetResults(IScope src, IScope target) {
-      foreach (IVariable v in src.Variables) {
+      foreach (HeuristicLab.Core.IVariable v in src.Variables) {
         target.AddVariable(v);
       }
@@ -85 +85 @@
     }
 
-    protected void StoreResults(IAlgorithm finishedAlgorithm) {
+    protected void StoreResults(HeuristicLab.Modeling.IAlgorithm finishedAlgorithm) {
       databaseService.Persist(finishedAlgorithm);
       //Entity modelEntity = new Entity(Ontology.CedmaNameSpace + Guid.NewGuid());

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/GridExecuter.cs

@@ -39 +39 @@
 using System.Threading;
 using HeuristicLab.Modeling;
-using HeuristicLab.Modeling.SQLServerCompactBackend;
+using HeuristicLab.Modeling.Database;
 
 namespace HeuristicLab.CEDMA.Server {
   public class GridExecuter : ExecuterBase {
     private JobManager jobManager;
-    private Dictionary<AsyncGridResult, IAlgorithm> activeAlgorithms;
+    private Dictionary<AsyncGridResult, HeuristicLab.Modeling.IAlgorithm> activeAlgorithms;
 
     private TimeSpan StartJobInterval {
@@ -59 +59 @@
 
     public GridExecuter(IDispatcher dispatcher,  IGridServer server, IModelingDatabase databaseService)
-      : base(dispatcher, store, databaseService) {
+      : base(dispatcher, databaseService) {
       this.jobManager = new JobManager(server);
-      activeAlgorithms = new Dictionary<AsyncGridResult, IAlgorithm>();
+      activeAlgorithms = new Dictionary<AsyncGridResult, HeuristicLab.Modeling.IAlgorithm>();
       jobManager.Reset();
     }
@@ -73 +73 @@
             Thread.Sleep(StartJobInterval);
             // get an execution from the dispatcher and execute in grid via job-manager
-            IAlgorithm algorithm = Dispatcher.GetNextJob();
+            HeuristicLab.Modeling.IAlgorithm algorithm = Dispatcher.GetNextJob();
             if (algorithm != null) {
               AtomicOperation op = new AtomicOperation(algorithm.Engine.OperatorGraph.InitialOperator, algorithm.Engine.GlobalScope);
@@ -93 +93 @@
             if (readyHandleIndex != WaitHandle.WaitTimeout) {
               WaitHandle readyHandle = whArr[readyHandleIndex];
-              IAlgorithm finishedAlgorithm = null;
+              HeuristicLab.Modeling.IAlgorithm finishedAlgorithm = null;
               AsyncGridResult finishedResult = null;
               lock (activeAlgorithms) {
@@ -140 +140 @@
         string[] retVal = new string[activeAlgorithms.Count];
         int i = 0;
-        foreach (IAlgorithm a in activeAlgorithms.Values) {
+        foreach (HeuristicLab.Modeling.IAlgorithm a in activeAlgorithms.Values) {
           retVal[i++] = a.Name + " " + a.Dataset.GetVariableName(a.TargetVariable);
         }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="LearningTask.cs" />
+    <Compile Include="Problem.cs" />
     <Compile Include="ProblemView.cs">
       <SubType>UserControl</SubType>
@@ -158 +160 @@
       <Project>{545CE756-98D8-423B-AC2E-6E7D70926E5C}</Project>
       <Name>HeuristicLab.Grid-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Modeling.Database.SQLServerCompact\3.2\HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj">
+      <Project>{EC1AA756-D612-4FA6-AA52-25CF4F8E3836}</Project>
+      <Name>HeuristicLab.Modeling.Database.SQLServerCompact-3.2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Modeling.Database\3.2\HeuristicLab.Modeling.Database-3.2.csproj">
+      <Project>{E84E5717-79F8-498F-A5E0-A055C4EC086B}</Project>
+      <Name>HeuristicLab.Modeling.Database-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling\3.2\HeuristicLab.Modeling-3.2.csproj">

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/Problem.cs

@@ -126 +126 @@
     }
 
-    public override IView CreateView() {
+    public IView CreateView() {
       return new ProblemView(this);
     }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/ProblemView.cs

@@ -31 +31 @@
 using HeuristicLab.DataAnalysis;
 using System.Diagnostics;
+using HeuristicLab.CEDMA.Core;
 
 namespace HeuristicLab.CEDMA.Server {

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -34 +34 @@
 using HeuristicLab.Core;
 using HeuristicLab.Modeling.Database;
-using HeuristicLab.Modeling.Database.SqlServerCompact;
+using HeuristicLab.Modeling.Database.SQLServerCompact;
 
 namespace HeuristicLab.CEDMA.Server {
@@ -47 +47 @@
     public IExecuter Executer { get { return executer; } }
     private Problem problem;
+    public Problem Problem { get { return problem; } }
 
     private string gridServiceUrl;

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.CEDMA.Server/3.3/ServerApplication.cs

@@ -31 +31 @@
     public override void Run() {
       Server server = new Server();
-      server.Start();
       Form mainForm = new Form();
       UserControl serverControl = (UserControl)server.CreateView();

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DataObjects/Model.cs

@@ -8 +8 @@
 namespace HeuristicLab.Modeling.Database.SQLServerCompact {
   [Table(Name = "Model")]
-  public class Model : IModel{
+  public class Model : IModel {
     public Model() {
       targetVariable = default(EntityRef<Variable>);
@@ -92 +92 @@
           if (value != null) {
             targetVariableId = ((Variable)value).Id;
-          } 
+          }
         }
       }

branches/HeuristicLab.Modeling Database Backend/sources/HeuristicLab.SQLServerCompact/3.2/Properties/AssemblyInfo.cs

@@ -34 +34 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.2182")]
-[assembly: AssemblyFileVersion("3.2.0.2182")]
-[assembly: AssemblyBuildDate("2009/07/27 17:16:03")]
+[assembly: AssemblyVersion("3.2.0.2189")]
+[assembly: AssemblyFileVersion("3.2.0.2189")]
+[assembly: AssemblyBuildDate("2009/07/28 14:23:16")]