Changeset 1440

Timestamp:

03/27/09 13:17:44 (16 years ago)

Author:

gkronber

Message:

Worked on hive engine. #545 (Engine which can be executed in the Hive)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Engine/HeuristicLab.Hive.Engine.csproj (modified) (6 diffs)
• HeuristicLab.Hive.Engine/HiveEngine.cs (modified) (2 diffs)
• HeuristicLab.Hive.Engine/HiveEngineEditor.cs (modified) (2 diffs)
• HeuristicLab.Hive.Engine/Job.cs (added)
• HeuristicLab.Hive.Engine/ServiceLocator.cs (added)
• HeuristicLab.sln (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Engine/HeuristicLab.Hive.Engine.csproj

@@ -31 +31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -37 +53 @@
     </Reference>
     <Reference Include="System.Drawing" />
+    <Reference Include="System.ServiceModel">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq">
@@ -48 +67 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Job.cs" />
     <Compile Include="HeuristicLabHiveEnginePlugin.cs" />
     <Compile Include="HiveEngine.cs" />
     <Compile Include="HiveEngineEditor.cs">
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="HiveEngineEditor.Designer.cs">
       <DependentUpon>HiveEngineEditor.cs</DependentUpon>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceLocator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -60 +83 @@
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.DataAccess\HeuristicLab.DataAccess.csproj">
+      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
+      <Name>HeuristicLab.DataAccess</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Hive.Contracts\HeuristicLab.Hive.Contracts.csproj">
+      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
+      <Name>HeuristicLab.Hive.Contracts</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Hive.JobBase\HeuristicLab.Hive.JobBase.csproj">
@@ -68 +99 @@
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.SequentialEngine\HeuristicLab.SequentialEngine.csproj">
+      <Project>{B4BE8E53-BA06-4237-9A01-24255F880201}</Project>
+      <Name>HeuristicLab.SequentialEngine</Name>
     </ProjectReference>
   </ItemGroup>
@@ -86 +121 @@
   </Target>
   -->
+  <PropertyGroup>
+    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd</PreBuildEvent>
+  </PropertyGroup>
 </Project>

trunk/sources/HeuristicLab.Hive.Engine/HiveEngine.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using System.Threading;
+using HeuristicLab.Hive.JobBase;
+using HeuristicLab.Hive.Contracts.Interfaces;
 
 namespace HeuristicLab.Hive.Engine {
@@ -31 +33 @@
   /// in parallel.
   /// </summary>
-  public class HiveEngine : EngineBase, IEditable {
-    private IOperator currentOperator;
+  public class HiveEngine : ItemBase, IEngine, IEditable {
+    private Job job;
+    public string HiveServerUrl { get; set; }
 
-    /// <summary>
-    /// Creates a new instance of <see cref="HiveEngineEditor"/>.
-    /// </summary>
-    /// <returns>The created view as <see cref="HiveEngineEditor"/>.</returns>
+    public HiveEngine() {
+      job = new Job();
+    }
+
+
+    #region IEngine Members
+
+    public IOperatorGraph OperatorGraph {
+      get { return job.Engine.OperatorGraph; }
+    }
+
+    public IScope GlobalScope {
+      get { return job.Engine.GlobalScope; }
+    }
+
+    public TimeSpan ExecutionTime {
+      get { return job.Engine.ExecutionTime; }
+    }
+
+    public bool Running {
+      get { return job.Engine.Running; }
+    }
+
+    public bool Canceled {
+      get { return job.Engine.Canceled; }
+    }
+
+    public bool Terminated {
+      get { return job.Engine.Terminated; }
+    }
+
+    public void Execute() {
+      IExecutionEngineFacade executionEngineFacade = ServiceLocator.CreateExecutionEngineFacade(HiveServerUrl);
+      HeuristicLab.Hive.Contracts.BusinessObjects.Job jobObj = new HeuristicLab.Hive.Contracts.BusinessObjects.Job();
+      jobObj.SerializedJob = PersistenceManager.SaveToGZip(job);
+      executionEngineFacade.AddJob(jobObj);
+    }
+
+    public void ExecuteStep() {
+      throw new NotSupportedException();
+    }
+
+    public void ExecuteSteps(int steps) {
+      throw new NotSupportedException();
+    }
+
+    public void Abort() {
+      throw new NotImplementedException();
+    }
+
+    public void Reset() {
+      throw new NotImplementedException();
+    }
+
+    public event EventHandler Initialized;
+
+    public event EventHandler<OperationEventArgs> OperationExecuted;
+
+    public event EventHandler<ExceptionEventArgs> ExceptionOccurred;
+
+    public event EventHandler ExecutionTimeChanged;
+
+    public event EventHandler Finished;
+
+    #endregion
+
+    public void RequestSnapshot() {
+      throw new NotImplementedException();
+    }
+
     public override IView CreateView() {
       return new HiveEngineEditor(this);
     }
 
-    /// <summary>
-    /// Creates a new instance of <see cref="HiveEngineEditor"/>.
-    /// </summary>
-    /// <returns>The created editor as <see cref="HiveEngineEditor"/>.</returns>
-    public virtual IEditor CreateEditor() {
+    #region IEditable Members
+
+    public IEditor CreateEditor() {
       return new HiveEngineEditor(this);
     }
-
-    /// <summary>
-    /// Aborts the current operator.
-    /// </summary>
-    /// <remarks>Calls <see cref="EngineBase.Abort"/> of base class <see cref="EngineBase"/> and
-    /// <see cref="IOperator.Abort"/> of the current <see cref="IOperator"/>.</remarks>
-    public override void Abort() {
-      base.Abort();
-      if (currentOperator != null)
-        currentOperator.Abort();
-    }
-
-    /// <summary>
-    /// Deals with the next operation, if it is an <see cref="AtomicOperation"/> it is executed,
-    /// if it is a <see cref="CompositeOperation"/> its single operations are pushed on the execution stack.
-    /// </summary>
-    /// <remarks>If an error occurs during the execution the operation is aborted and the operation
-    /// is pushed on the stack again.<br/>
-    /// If the execution was successful <see cref="EngineBase.OnOperationExecuted"/> is called.</remarks>
-    protected override void ProcessNextOperation() {
-      IOperation operation = myExecutionStack.Pop();
-      if (operation is AtomicOperation) {
-        AtomicOperation atomicOperation = (AtomicOperation)operation;
-        IOperation next = null;
-        try {
-          currentOperator = atomicOperation.Operator;
-          next = atomicOperation.Operator.Execute(atomicOperation.Scope);
-        }
-        catch (Exception ex) {
-          // push operation on stack again
-          myExecutionStack.Push(atomicOperation);
-          Abort();
-          ThreadPool.QueueUserWorkItem(delegate(object state) { OnExceptionOccurred(ex);});
-        }
-        if (next != null)
-          myExecutionStack.Push(next);
-        OnOperationExecuted(atomicOperation);
-        if (atomicOperation.Operator.Breakpoint) Abort();
-      } else if (operation is CompositeOperation) {
-        CompositeOperation compositeOperation = (CompositeOperation)operation;
-        for (int i = compositeOperation.Operations.Count - 1; i >= 0; i--)
-          myExecutionStack.Push(compositeOperation.Operations[i]);
-      }
-    }
+    #endregion
   }
 }

trunk/sources/HeuristicLab.Hive.Engine/HiveEngineEditor.cs

@@ -41 +41 @@
     public HiveEngine HiveEngine {
       get { return (HiveEngine)Engine; }
-      set { base.Engine = value; }
+      set {
+        base.Engine = value;
+        SetDataBinding();
+      }
     }
 
@@ -59 +62 @@
       HiveEngine = hiveEngine;
     }
+
+    private void SetDataBinding() {
+      urlTextBox.DataBindings.Add("Text", HiveEngine, "HiveServerUrl");
+    }
   }
 }

trunk/sources/HeuristicLab.sln

@@ -1303 +1303 @@
     {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Visualization Debug|Any CPU.Build.0 = Debug|Any CPU
     {4D5A2A16-66C2-431D-9AA3-BD3041E64B84}.Visualization Debug|x86.ActiveCfg = Debug|Any CPU
-    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.CEDMA Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.CEDMA Debug|Any CPU.Build.0 = Debug|Any CPU
+    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
+    {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
     {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.CEDMA Debug|x86.ActiveCfg = Debug|Any CPU
     {C8FEDAC1-0326-4293-B585-F0FEDDEDFC11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU