Changeset 6519

Timestamp:

07/06/11 20:52:53 (13 years ago)

Author:

abeham

Message:

#1516

• fixed code formatting
• added some license headers
• removed unnecessary resx file

Location:

trunk/sources

Files:

• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.resx (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/CachedExternalEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs (modified) (5 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs (modified) (5 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Problems.ExternalEvaluation.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 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
+
+namespace HeuristicLab.Problems.ExternalEvaluation.Views {
   partial class EvaluationCacheView {
     /// <summary> 
@@ -53 +74 @@
       // hits_sizeTextBox
       // 
-      this.hits_sizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.hits_sizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.hits_sizeTextBox.Location = new System.Drawing.Point(59, 26);

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2011 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;
+using System.ComponentModel;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using System.Threading;
-using System.IO;
-using System.ComponentModel;
 
 namespace HeuristicLab.Problems.ExternalEvaluation.Views {
@@ -62 +81 @@
     }
     #endregion
-    
+
     private void saveButton_Click(object sender, EventArgs e) {
       if (saveFileDialog.ShowDialog() == DialogResult.OK) {
@@ -75 +94 @@
         worker.RunWorkerAsync(saveFileDialog.FileName);
       }
-    }    
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj

@@ -94 +94 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Data.Views-3.3">
+      <HintPath>..\..\HeuristicLab.Data.Views\3.3\bin\x86\Release\HeuristicLab.Data.Views-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -173 +177 @@
       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
       <Name>HeuristicLab.MainForm-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
@@ -203 +211 @@
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="EvaluationCacheView.resx">
-      <DependentUpon>EvaluationCacheView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/CachedExternalEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-
 using System.Threading;
 using HeuristicLab.Common;
@@ -27 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
 namespace HeuristicLab.Problems.ExternalEvaluation {
 

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs

@@ -52 +52 @@
     [StorableConstructor]
     protected EvaluationServiceClient(bool deserializing) : base(deserializing) { }
-    protected EvaluationServiceClient(EvaluationServiceClient original, Cloner cloner) : base(original, cloner) {
+    protected EvaluationServiceClient(EvaluationServiceClient original, Cloner cloner)
+      : base(original, cloner) {
       RegisterEvents();
-    }    
+    }
     public EvaluationServiceClient()
       : base() {
@@ -83 +84 @@
           result = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
           success = true;
-        }
-        catch (InvalidOperationException) {
+        } catch (InvalidOperationException) {
           throw;
-        }
-        catch {
+        } catch {
           if (tries >= maxTries)
             throw;
@@ -104 +103 @@
           Channel.Send(solution);
           success = true;
-        }
-        catch (InvalidOperationException) {
+        } catch (InvalidOperationException) {
           throw;
-        }
-        catch {
+        } catch {
           if (tries >= maxTries)
             throw;
@@ -123 +120 @@
         try {
           Channel.Open();
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
           throw new InvalidOperationException(Name + ": The channel could not be opened.", e);
         }
@@ -134 +130 @@
       try {
         message = (QualityMessage)Channel.Receive(QualityMessage.CreateBuilder());
-      }
-      catch { }
+      } catch { }
       ((Action<QualityMessage>)callback).Invoke(message);
     }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/EvaluationCache.cs

@@ -25 +25 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using HeuristicLab.Common;
@@ -33 +36 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Analysis;
-using System.IO;
-using System.Globalization;
-using System.Text.RegularExpressions;
+
 namespace HeuristicLab.Problems.ExternalEvaluation {
 
@@ -82 +82 @@
 
     private HashSet<string> activeEvaluations = new HashSet<string>();
-    private object cacheLock = new object();    
+    private object cacheLock = new object();
     #endregion
 
@@ -126 +126 @@
 
     #region Persistence
-    [Storable(Name="Cache")]
+    [Storable(Name = "Cache")]
     private IEnumerable<KeyValuePair<string, double>> Cache_Persistence {
       get {
@@ -194 +194 @@
       bool lockTaken = false;
       bool waited = false;
-      try {        
+      try {
         Monitor.Enter(cacheLock, ref lockTaken);
         while (true) {

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

@@ -59 +59 @@
     #region Fields
     protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    protected object clientLock = new object();    
+    protected object clientLock = new object();
     #endregion