Changeset 4116 for branches

Timestamp:

07/27/10 18:36:36 (14 years ago)

Author:

cneumuel

Message:

worked on HiveExperiment (#1115)

Location:

branches/3.3-HiveMigration/sources/HeuristicLab.Hive

Files:

• HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientDto.cs (modified) (1 diff)
• HeuristicLab.Hive.Engine/3.3/HiveEngine.cs (modified) (2 diffs)
• HeuristicLab.Hive.Experiment.Views/3.3 (modified) (1 prop)
• HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj (added)
• HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLabHiveExperimentViewsPlugin.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.cs (added)
• HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.resx (added)
• HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs (modified) (3 diffs)
• HeuristicLab.Hive.Experiment/3.3 (modified) (1 prop)
• HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj (added)
• HeuristicLab.Hive.Experiment/3.3/HeuristicLab.Hive.Experiment-3.3.csproj.user (added)
• HeuristicLab.Hive.Experiment/3.3/HeuristicLabHiveExperimentPlugin.cs (added)
• HeuristicLab.Hive.Experiment/3.3/HiveExperiment.cs (added)
• HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs (modified) (3 diffs)
• HeuristicLab.Hive.Experiment/3.3/Properties/Settings.Designer.cs (added)
• HeuristicLab.Hive.Experiment/3.3/Properties/Settings.settings (added)
• HeuristicLab.Hive.Experiment/3.3/ServiceLocator.cs (added)
• HeuristicLab.Hive.Experiment/3.3/Settings.cs (added)
• HeuristicLab.Hive.Experiment/3.3/app.config (added)
• HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.Console/3.3/JobListView.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs (modified) (17 diffs)
• HeuristicLab.Hive.Server.Core/3.3/DbTestApp.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.Core/3.3/JobManager.cs (modified) (8 diffs)
• HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/ClientDao.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs (modified) (5 diffs)
• HeuristicLab.Hive/3.3/MergeConfigs.cmd (modified) (1 diff)
• HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs (modified) (1 diff)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Client.Core/3.3/Properties/AssemblyInfo.cs

@@ -57 +57 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4107")]
-[assembly: AssemblyFileVersion("3.3.0.4107")]
-[assembly: AssemblyBuildDate("2010/07/27 14:15:11")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]
+[assembly: AssemblyBuildDate("2010/07/27 18:31:47")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/BusinessObjects/ClientDto.cs

@@ -28 +28 @@
 namespace HeuristicLab.Hive.Contracts.BusinessObjects {
 
-  public enum State { nullState, idle, calculating, offline, finished, abort, requestSnapshot, requestSnapshotSent, pending };
+  public enum State { NullState, Idle, Calculating, Offline, Finished, Abort, RequestSnapshot, RequestSnapshotSent, Pending };
   public enum CalendarState { Fetch, ForceFetch, Fetching, Fetched, NotAllowedToFetch };
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Engine/3.3/HiveEngine.cs

@@ -163 +163 @@
       JobDto jobDto = new JobDto();
 
-      // serialize current job
+      // serialize job
       MemoryStream memStream = new MemoryStream();
       XmlGenerator.Serialize(job, memStream);
@@ -183 +183 @@
       jobDto.CoresNeeded = 1;
       jobDto.PluginsNeeded = pluginsNeeded;
-      jobDto.State = State.offline;
+      jobDto.State = State.Offline;
       return executableJobObj;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs

@@ -1 @@
-using System.Reflection;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using HeuristicLab.PluginInfrastructure;
+using System.Security;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Hive.Experiment-3.3")]
+[assembly: AssemblyTitle("HeuristicLab.Hive.Experiment.Views")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("FH OOE")]
-[assembly: AssemblyProduct("HeuristicLab.Hive.Experiment-3.3")]
-[assembly: AssemblyCopyright("Copyright © FH OOE 2010")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HeuristicLab")]
+[assembly: AssemblyCopyright("(c) 2002-2008 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AllowPartiallyTrustedCallers]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -21 +44 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b89cec07-9515-4898-8cbf-24fea34b2635")]
+[assembly: Guid("9721605F-C79D-434a-8E42-C0A384477D53")]
 
 // Version information for an assembly consists of the following four values:
@@ -30 +53 @@
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]
+[assembly: AssemblyBuildDate("2010/07/27 18:32:02")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment/3.3/Properties/AssemblyInfo.cs

@@ -1 @@
-using System.Reflection;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+using HeuristicLab.PluginInfrastructure;
+using System.Security;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Hive.Experiment-3.3")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("HeuristicLab.Hive.Experiment")]
+[assembly: AssemblyDescription("HeuristicLab experiment for distributed computation")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("FH OOE")]
-[assembly: AssemblyProduct("HeuristicLab.Hive.Experiment-3.3")]
-[assembly: AssemblyCopyright("Copyright © FH OOE 2010")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("HeuristicLab")]
+[assembly: AssemblyCopyright("(c) 2002-2008 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AllowPartiallyTrustedCallers]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -21 +44 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("b89cec07-9515-4898-8cbf-24fea34b2635")]
+[assembly: Guid("9721605F-C79D-434a-8E42-C0A384477D53")]
 
 // Version information for an assembly consists of the following four values:
@@ -30 +53 @@
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]
+[assembly: AssemblyBuildDate("2010/07/27 18:31:34")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/AddJobForm.cs

@@ -110 +110 @@
         if (numJobs > 0) {
           for (int i = 0; i < numJobs; i++) {
-            JobDto job = new JobDto { State = State.offline, CoresNeeded = 1 };
+            JobDto job = new JobDto { State = State.Offline, CoresNeeded = 1 };
             
             // if project selected (0 -> none)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -109 +109 @@
     void jdf_NewDataAvailable(object sender, EventArgs e) {
       JobDataFetcher fetcher = (JobDataFetcher) sender;
-      if (fetcher.PollStates.Contains(State.finished)) {
+      if (fetcher.PollStates.Contains(State.Finished)) {
         updateJobListView(fetcher, lv_finishedJobs, 0);
-      } else if(fetcher.PollStates.Contains(State.calculating)) {
+      } else if(fetcher.PollStates.Contains(State.Calculating)) {
         updateJobListView(fetcher, lv_calculatingJobs, 1);
-      } else if (fetcher.PollStates.Contains(State.offline)) {
+      } else if (fetcher.PollStates.Contains(State.Offline)) {
         updateJobListView(fetcher, lv_offlineJobs, 2);
       }
@@ -136 +136 @@
     private void Init() {
 
-      jdfFinished = new JobDataFetcher(new State[] {State.finished}, 50);
-      jdfCalculating = new JobDataFetcher(new State[] {State.calculating}, 50);
-      jdfOffline = new JobDataFetcher(new State[] {State.offline}, 50);
+      jdfFinished = new JobDataFetcher(new State[] {State.Finished}, 50);
+      jdfCalculating = new JobDataFetcher(new State[] {State.Calculating}, 50);
+      jdfOffline = new JobDataFetcher(new State[] {State.Offline}, 50);
 
       cmb_finishedJob_count.SelectedItem = "50";
@@ -348 +348 @@
           int percentageUsage = CapacityRam(((ClientDto)resource).NrOfCores, ((ClientDto)resource).NrOfFreeCores);
           int usage = 3;
-          if ((((ClientDto)resource).State != State.offline) &&
-            (((ClientDto)resource).State != State.nullState)) {
+          if ((((ClientDto)resource).State != State.Offline) &&
+            (((ClientDto)resource).State != State.NullState)) {
             if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
               usage = 0;
@@ -419 +419 @@
       //lvSnapshots.Enabled = true;
 
-      if (job.State == State.offline) {
+      if (job.State == State.Offline) {
         pbJobControl.Image = ilLargeImgJob.Images[2];
-      } else if (job.State == State.calculating) {
+      } else if (job.State == State.Calculating) {
         pbJobControl.Image = ilLargeImgJob.Images[1];
-      } else if (job.State == State.finished) {
+      } else if (job.State == State.Finished) {
         pbJobControl.Image = ilLargeImgJob.Images[0];
       }
@@ -480 +480 @@
         lvJobDetails.Items.Add(lvi);
 
-        if (job.State == State.finished) {
+        if (job.State == State.Finished) {
           lvi = null;
             lvi = new ListViewItem();
@@ -500 +500 @@
         int percentageUsage = CapacityRam(currentClient.NrOfCores, currentClient.NrOfFreeCores);
         int usage = 3;
-        if ((currentClient.State != State.offline) && (currentClient.State != State.nullState)) {
+        if ((currentClient.State != State.Offline) && (currentClient.State != State.NullState)) {
           if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
             usage = 0;
@@ -630 +630 @@
         JobDto selectedJob = (JobDto)jlv.SelectedItems[0].Tag;
 
-        if (selectedJob != null && selectedJob.State == State.calculating) {
+        if (selectedJob != null && selectedJob.State == State.Calculating) {
           jlv.ContextMenuStrip.Items.Add(offlineItemAbortJob);
           jlv.ContextMenuStrip.Items.Add(menuItemGetSnapshot);
@@ -806 +806 @@
               change = true;
             }
-            if (job.State != State.offline) {
+            if (job.State != State.Offline) {
               if ((!IsEqual(job.Client, jobold.Client)) || (job.State != jobold.State)
                    || (job.Percentage != jobold.Percentage)) {

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/JobListView.cs

@@ -40 +40 @@
       JobDataFetcher datafetcher = (JobDataFetcher) sender;
       this.BeginUpdate();
-      if (datafetcher.PollStates.Contains(State.finished)) {
+      if (datafetcher.PollStates.Contains(State.Finished)) {
         this.Items.Clear();
         ListViewItem lviDummy = new ListViewItem("blahr", 0);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/ClientCommunicator.cs

@@ -82 +82 @@
 
         foreach (ClientDto client in allClients) {
-          if (client.State != State.offline && client.State != State.nullState) {
+          if (client.State != State.Offline && client.State != State.NullState) {
             heartbeatLock.EnterUpgradeableReadLock();
 
@@ -88 +88 @@
               Logger.Info("Client " + client.Id +
                               " wasn't offline but hasn't sent heartbeats - setting offline");
-              client.State = State.offline;
+              client.State = State.Offline;
               DaoLocator.ClientDao.Update(client);
               Logger.Info("Client " + client.Id +
@@ -113 +113 @@
                 Logger.Debug("setting client offline");
                 // client must be set offline
-                client.State = State.offline;
+                client.State = State.Offline;
 
                 //clientAdapter.Update(client);
@@ -146 +146 @@
 
     private void CheckForPendingJobs() {
-      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.pending));
+      IList<JobDto> pendingJobsInDB = new List<JobDto>(DaoLocator.JobDao.GetJobsByState(State.Pending));
 
       foreach (JobDto currJob in pendingJobsInDB) {
@@ -152 +152 @@
           if (pendingJobs.ContainsKey(currJob.Id)) {
             if (pendingJobs[currJob.Id] <= 0) {
-              currJob.State = State.offline;
+              currJob.State = State.Offline;
               DaoLocator.JobDao.Update(currJob);
             } else {
@@ -185 +185 @@
       //Really set offline? 
       //Reconnect issues with the currently calculating jobs
-      clientInfo.State = State.idle;
+      clientInfo.State = State.Idle;
       clientInfo.CalendarSyncStatus = dbClient != null ? dbClient.CalendarSyncStatus : CalendarState.NotAllowedToFetch;
 
@@ -258 +258 @@
       Logger.Debug("END Finished Client Fetching");
       // check if the client is logged in
-      if (client.State == State.offline || client.State == State.nullState) {
+      if (client.State == State.Offline || client.State == State.NullState) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_USER_NOT_LOGGED_IN;
@@ -341 +341 @@
             response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_IS_NOT_BEEING_CALCULATED;
             Logger.Error("There is no job calculated by this user " + hbData.ClientId + " Job: " + curJob);
-          } else if (curJob.State == State.abort) {
+          } else if (curJob.State == State.Abort) {
             // a request to abort the job has been set
             response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.AbortJob, curJob.Id));
-            curJob.State = State.finished;
+            curJob.State = State.Finished;
           } else {
             // save job progress
             curJob.Percentage = jobProgress.Value;
 
-            if (curJob.State == State.requestSnapshot) {
+            if (curJob.State == State.RequestSnapshot) {
               // a request for a snapshot has been set
               response.ActionRequest.Add(new MessageContainer(MessageContainer.MessageType.RequestSnapshot, curJob.Id));
-              curJob.State = State.requestSnapshotSent;
+              curJob.State = State.RequestSnapshotSent;
             }
           }
@@ -376 +376 @@
                 Logger.Error("Job TTL reached Zero, Job gets removed: " + currJob + " and set back to offline. User that sucks: " + currJob.Client);
 
-                currJob.State = State.offline;
+                currJob.State = State.Offline;
                 DaoLocator.JobDao.Update(currJob);
 
@@ -385 +385 @@
             } else {
               Logger.Error("Job ID wasn't with the heartbeats:  " + currJob);
-              currJob.State = State.offline;
+              currJob.State = State.Offline;
               DaoLocator.JobDao.Update(currJob);
             }
@@ -516 +516 @@
         return response;
       }
-      if (job.JobInfo.State == State.abort) {
+      if (job.JobInfo.State == State.Abort) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_WAS_ABORTED;
@@ -545 +545 @@
         return response;
       }
-      if (job.JobInfo.State == State.finished) {
+      if (job.JobInfo.State == State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
@@ -556 +556 @@
       }
       //Todo: RequestsnapshotSent => calculating?
-      if (job.JobInfo.State == State.requestSnapshotSent) {
-        job.JobInfo.State = State.calculating;
-      }
-      if (job.JobInfo.State != State.calculating &&
-        job.JobInfo.State != State.pending) {
+      if (job.JobInfo.State == State.RequestSnapshotSent) {
+        job.JobInfo.State = State.Calculating;
+      }
+      if (job.JobInfo.State != State.Calculating &&
+        job.JobInfo.State != State.Pending) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_WRONG_JOB_STATE;
@@ -573 +573 @@
 
       if (finished) {
-        job.JobInfo.State = State.finished;
+        job.JobInfo.State = State.Finished;
         job.JobInfo.DateFinished = DateTime.Now;
       }
@@ -637 +637 @@
         return response;
       }
-      if (client.State == State.calculating) {
+      if (client.State == State.Calculating) {
         // check wich job the client was calculating and reset it
         IEnumerable<JobDto> jobsOfClient = DaoLocator.JobDao.FindActiveJobsOfClient(client);
         foreach (JobDto job in jobsOfClient) {
-          if (job.State != State.finished)
+          if (job.State != State.Finished)
             DaoLocator.JobDao.SetJobOffline(job);
         }
       }
 
-      client.State = State.offline;
+      client.State = State.Offline;
       DaoLocator.ClientDao.Update(client);
 
@@ -670 +670 @@
         return response;
       }
-      if (job.State == State.finished) {
+      if (job.State == State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOB_ALLREADY_FINISHED;
@@ -676 +676 @@
         return response;
       }
-      job.State = State.pending;
+      job.State = State.Pending;
       lock (pendingJobs) {
         pendingJobs.Add(job.Id, PENDING_TIMEOUT);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DbTestApp.cs

@@ -123 +123 @@
       c1.NrOfFreeCores = 2;
       c1.CpuSpeedPerCore = 2500;
-      c1.State = State.idle;
+      c1.State = State.Idle;
       c1 = clientDao.Insert(c1);
 
@@ -137 +137 @@
       c2.NrOfFreeCores = 1;
       c2.CpuSpeedPerCore = 4000;
-      c2.State = State.idle;
+      c2.State = State.Idle;
       c2 = clientDao.Insert(c2);
 
@@ -159 +159 @@
         Percentage = 0,
         Priority = 1,
-        State = State.offline
+        State = State.Offline
       };
 
@@ -204 +204 @@
         client.NrOfFreeCores = 2;
         client.CpuSpeedPerCore = 2500;
-        client.State = State.idle;
+        client.State = State.Idle;
         client = clientDao.Insert(client);
         cgd.AddRessourceToClientGroup(client.Id, mg.Id);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/DefaultScheduler.cs

@@ -26 +26 @@
     public bool ExistsJobForClient(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
       List<JobDto> allOfflineJobsForClient =
-        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, hbData.FreeCores, hbData.FreeMemory,
+        new List<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, hbData.FreeCores, hbData.FreeMemory,
                                                                     hbData.ClientId));
       return (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0);
@@ -38 +38 @@
         ClientDto client = DaoLocator.ClientDao.FindById(clientId);
         LinkedList<JobDto> allOfflineJobsForClient =
-          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.offline, client.NrOfFreeCores,
+          new LinkedList<JobDto>(DaoLocator.JobDao.FindFittingJobsForClient(State.Offline, client.NrOfFreeCores,
                                                                             client.FreeMemory, client.Id));        
         if (allOfflineJobsForClient != null && allOfflineJobsForClient.Count > 0) {
           jobToCalculate = allOfflineJobsForClient.First.Value;
-          jobToCalculate.State = State.calculating;
+          jobToCalculate.State = State.Calculating;
           jobToCalculate.Client = client;
-          jobToCalculate.Client.State = State.calculating;
+          jobToCalculate.Client.State = State.Calculating;
           jobToCalculate.DateCalculated = DateTime.Now;
           DaoLocator.JobDao.AssignClientToJob(client.Id, jobToCalculate.Id);

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/JobManager.cs

@@ -66 +66 @@
         List<JobDto> allJobs = new List<JobDto>(DaoLocator.JobDao.FindAll());
         foreach (JobDto curJob in allJobs) {
-          if (curJob.State != State.calculating && curJob.State != State.finished) {
+          if (curJob.State != State.Calculating && curJob.State != State.Finished) {
             DaoLocator.JobDao.SetJobOffline(curJob);
           }
@@ -170 +170 @@
 
       if (job != null && job.JobInfo != null) {
-        if (job.JobInfo.State != State.offline) {
+        if (job.JobInfo.State != State.Offline) {
           response.Success = false;
           response.StatusMessage = ApplicationConstants.RESPONSE_JOB_JOBSTATE_MUST_BE_OFFLINE;
@@ -242 +242 @@
 
       //if it's a snapshot but the result hasn't reached the server yet...
-      if (snapshot && (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent)) {
+      if (snapshot && (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent)) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
@@ -250 +250 @@
 
       //if it's NOT a snapshot, NEITHER request NOR is it finished
-      if (!requested && !snapshot && job.State != State.finished) {
+      if (!requested && !snapshot && job.State != State.Finished) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_RESULT_NOT_YET_HERE;
@@ -273 +273 @@
 
       JobDto job = DaoLocator.JobDao.FindById(jobId);
-      if (job.State == State.requestSnapshot || job.State == State.requestSnapshotSent) {
+      if (job.State == State.RequestSnapshot || job.State == State.RequestSnapshotSent) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_REQUEST_ALLREADY_SET;
         return response;
       }
-      if (job.State != State.calculating) {
+      if (job.State != State.Calculating) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
@@ -284 +284 @@
       }
       // job is in correct state
-      job.State = State.requestSnapshot;
+      job.State = State.RequestSnapshot;
       DaoLocator.JobDao.Update(job);
 
@@ -302 +302 @@
         return response; // no commit needed
       }
-      if (job.State == State.abort) {
+      if (job.State == State.Abort) {
         response.Success = true;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_ABORT_REQUEST_ALLREADY_SET;
         return response; // no commit needed
       }
-      if (job.State != State.calculating && job.State != State.requestSnapshot && job.State != State.requestSnapshotSent) {
+      if (job.State != State.Calculating && job.State != State.RequestSnapshot && job.State != State.RequestSnapshotSent) {
         response.Success = false;
         response.StatusMessage = ApplicationConstants.RESPONSE_JOB_IS_NOT_BEEING_CALCULATED;
@@ -313 +313 @@
       }
       // job is in correct state
-      job.State = State.abort;
+      job.State = State.Abort;
       DaoLocator.JobDao.Update(job);
 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Core/3.3/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.0.4107")]
-[assembly: AssemblyFileVersion("3.3.0.4107")]
-[assembly: AssemblyBuildDate("2010/07/27 14:15:12")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]
+[assembly: AssemblyBuildDate("2010/07/27 18:31:46")]

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/ClientDao.cs

@@ -101 +101 @@
       target.NrOfCores = source.NumberOfCores ?? 0;
       target.NrOfFreeCores = source.NumberOfFreeCores ?? 0;
-      target.State = (State) Enum.Parse(typeof (State), source.Status);
+      target.State = (State) Enum.Parse(typeof (State), source.Status, true);
       return target;
     } 

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.LINQDataAccess/3.3/JobDao.cs

@@ -28 +28 @@
 
       IQueryable<JobDto> query = null;
-      if (jobState == State.finished) {
+      if (jobState == State.Finished) {
          query = from job in Context.Jobs
                  where job.JobState == Enum.GetName(typeof (State), jobState)
                  orderby job.DateFinished
                  select EntityToDto(job, null);
-      } else if (jobState == State.calculating || jobState == State.requestSnapshot || jobState == State.requestSnapshotSent) {
+      } else if (jobState == State.Calculating || jobState == State.RequestSnapshot || jobState == State.RequestSnapshotSent) {
         query = from job in Context.Jobs
                     where job.JobState == Enum.GetName(typeof(State), jobState)
@@ -97 +97 @@
     public IEnumerable<JobDto> FindActiveJobsOfClient(ClientDto client) {
       return (from j in Context.Jobs
-              where (j.JobState == Enum.GetName(typeof (State), State.calculating) ||
-                     j.JobState == Enum.GetName(typeof (State), State.abort) ||
-                     j.JobState == Enum.GetName(typeof (State), State.requestSnapshot) ||
-                     j.JobState == Enum.GetName(typeof (State), State.requestSnapshotSent)) &&
+              where (j.JobState == Enum.GetName(typeof (State), State.Calculating) ||
+                     j.JobState == Enum.GetName(typeof (State), State.Abort) ||
+                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshot) ||
+                     j.JobState == Enum.GetName(typeof (State), State.RequestSnapshotSent)) &&
                     (j.ResourceId.Equals(client.Id))
               select EntityToDto(j, null)).ToList();
@@ -112 +112 @@
       
       var q = (from ar in Context.AssignedResources               
-               where ar.Job.JobState == Enum.GetName(typeof (State), State.offline) &&
+               where ar.Job.JobState == Enum.GetName(typeof (State), State.Offline) &&
                      ar.Job.CoresNeeded <= freeCores &&
                      ar.Job.MemoryNeeded <= freeMemory &&
@@ -139 +139 @@
       Job j = Context.Jobs.SingleOrDefault(jq => jq.JobId.Equals(job.Id));
       j.Client = null;
-      j.JobState = Enum.GetName(typeof(State), State.offline); 
+      j.JobState = Enum.GetName(typeof(State), State.Offline); 
       CommitChanges();
     }
@@ -199 +199 @@
       
       target.Priority = source.Priority;
-      target.State = (State) Enum.Parse(typeof (State), source.JobState);
+      target.State = (State) Enum.Parse(typeof (State), source.JobState, true);
       return target;
     }

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/MergeConfigs.cmd

@@ -1 +1 @@
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Server\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 ConfigMerger "%SolutionDir%HeuristicLab.Hive.Client.Core\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
+ConfigMerger "%SolutionDir%HeuristicLab.Hive.Experiment\3.3\app.config" "HeuristicLab.Hive-3.3.dll.config"
 
 ConfigMerger "HeuristicLab.Hive-3.3.dll.config" "HeuristicLab 3.3.exe.config"

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive/3.3/Properties/AssemblyInfo.cs

@@ -51 +51 @@
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.0.4107")]
-[assembly: AssemblyFileVersion("3.3.0.4107")]
+[assembly: AssemblyVersion("3.3.0.4111")]
+[assembly: AssemblyFileVersion("3.3.0.4111")]