Changeset 7215 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3

Timestamp:

12/20/11 13:54:57 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (2 props)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (4 diffs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis/3.3/MultiAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Analysis/3.3/ValueAnalysis/ValueAnalyzer.cs (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs

@@ -37 +37 @@
   [StorableClass]
   public abstract class AlleleFrequencyAnalyzer<T> : SingleSuccessorOperator, IAnalyzer where T : class, IItem {
+    public virtual bool EnabledByDefault {
+      get { return false; }
+    }
+
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.cs

@@ -37 +37 @@
   [StorableClass]
   public class BestScopeSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
+
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -84 +88 @@
         i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
       else i = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
-      
+
       IEnumerable<IScope> scopes = new IScope[] { ExecutionContext.Scope };
       for (int j = 0; j < QualityParameter.Depth; j++)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -152 +152 @@
       }
     }
+    private bool isVisibleInLegend;
+    public bool IsVisibleInLegend {
+      get { return isVisibleInLegend; }
+      set {
+        if (isVisibleInLegend != value) {
+          isVisibleInLegend = value;
+          OnPropertyChanged("IsVisibleInLegend");
+        }
+      }
+    }
     private string displayName;
     public string DisplayName {
@@ -218 +228 @@
       get { return scaleFactor; }
       set { scaleFactor = value; }
+    }
+    [Storable(Name = "IsVisibleInLegend", DefaultValue = true)]
+    private bool StorableIsVisibleInLegend {
+      get { return isVisibleInLegend; }
+      set { isVisibleInLegend = value; }
     }
     [Storable(Name = "DisplayName")]
@@ -241 +256 @@
       this.scaleFactor = original.scaleFactor;
       this.displayName = original.displayName;
+      this.isVisibleInLegend = original.isVisibleInLegend;
     }
     public DataRowVisualProperties() {
@@ -254 +270 @@
       scaleFactor = 1.0;
       displayName = String.Empty;
+      isVisibleInLegend = true;
     }
     public DataRowVisualProperties(string displayName)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -101 +101 @@
     <Reference Include="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -38 +38 @@
     public override bool CanChangeName {
       get { return false; }
+    }
+    public virtual bool EnabledByDefault {
+      get { return true; }
     }
 

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/MultiObjective/ParetoFrontAnalyzer.cs

@@ -11 +11 @@
   [StorableClass]
   public abstract class ParetoFrontAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
+
     public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter {
       get { return (IScopeTreeLookupParameter<DoubleArray>)Parameters["Qualities"]; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs

@@ -37 +37 @@
   [StorableClass]
   public abstract class PopulationDiversityAnalyzer<T> : SingleSuccessorOperator, IAnalyzer where T : class, IItem {
+    public virtual bool EnabledByDefault {
+      get { return false; }
+    }
+
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs

@@ -74 +74 @@
 
     #region Properties
+    public bool EnabledByDefault {
+      get { return true; }
+    }
     private BestQualityMemorizer BestQualityMemorizer {
       get { return (BestQualityMemorizer)OperatorGraph.InitialOperator; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityAnalyzer.cs

@@ -65 +65 @@
 
     #region Properties
+    public bool EnabledByDefault {
+      get { return true; }
+    }
     private BestQualityMemorizer BestQualityMemorizer {
       get { return (BestQualityMemorizer)OperatorGraph.InitialOperator; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityDistributionAnalyzer.cs

@@ -54 +54 @@
     }
     #endregion
+
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
 
     public string HistogramName {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/QualityAnalysis/ScaledQualityDifferenceAnalyzer.cs

@@ -34 +34 @@
   [StorableClass]
   public class ScaledQualityDifferenceAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
+
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueAnalyzer.cs

@@ -68 +68 @@
 
     #region Properties
+    public bool EnabledByDefault {
+      get { return true; }
+    }
     private MinAverageMaxValueCalculator MinAverageMaxValueCalculator {
       get { return (MinAverageMaxValueCalculator)OperatorGraph.InitialOperator; }
@@ -81 +84 @@
     }
     #endregion
+
     [Storable]
     private ResultsCollector resultsCollector;
@@ -193 +197 @@
       else if (!CollectMaxValueInResults.Value && maxValueParameter != null)
         resultsCollector.CollectedValues.Remove(maxValueParameter);
-      }
+    }
 
     private void CollectMinValueInResultsParameter_ValueChanged(object sender, EventArgs e) {

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/ValueAnalysis/ValueAnalyzer.cs

@@ -50 +50 @@
 
     #region Properties
+    public bool EnabledByDefault {
+      get { return true; }
+    }
     private DataTableValuesCollector DataTableValuesCollector {
       get { return (DataTableValuesCollector)OperatorGraph.InitialOperator; }
@@ -63 +66 @@
     private ValueAnalyzer(ValueAnalyzer original, Cloner cloner)
       : base(original, cloner) {
-        Initialize();
+      Initialize();
     }
     public override IDeepCloneable Clone(Cloner cloner) {

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen