Changeset 15196


Ignore:
Timestamp:
07/11/17 12:58:52 (12 days ago)
Author:
gkronber
Message:

#2757: merged r14789,r14790,r14791,r14853,r15016 from trunk to stable

Location:
stable
Files:
13 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r14186 r15196  
    463463    }
    464464
     465  public bool StatisticsVisible {
     466    get { return splitContainer.Panel2Collapsed; }
     467    set { splitContainer.Panel2Collapsed = value; }
     468  }
     469 
    465470    public void SetXAxis(string axisName) {
    466471      xAxisComboBox.SelectedItem = axisName;
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

    r15195 r15196  
    157157    <Compile Include="Regression\FeatureSelection\FeatureSelection.cs" />
    158158    <Compile Include="Regression\FeatureSelection\FeatureSelectionInstanceProvider.cs" />
     159    <Compile Include="Regression\MibaFriction\CF3.cs" />
     160    <Compile Include="Regression\MibaFriction\Wear1.cs" />
     161    <Compile Include="Regression\MibaFriction\Wear2.cs" />
     162    <Compile Include="Regression\MibaFriction\Temp2.cs" />
     163    <Compile Include="Regression\MibaFriction\Temp1.cs" />
     164    <Compile Include="Regression\MibaFriction\NvhRating.cs" />
     165    <Compile Include="Regression\MibaFriction\CF4.cs" />
     166    <Compile Include="Regression\MibaFriction\CF2.cs" />
     167    <Compile Include="Regression\MibaFriction\CF1.cs" />
     168    <Compile Include="Regression\MibaFriction\MibaFrictionRegressionInstanceProvider.cs" />
    159169    <Compile Include="Regression\VariableNetworks\LinearVariableNetwork.cs" />
    160170    <Compile Include="Regression\VariableNetworks\GaussianProcessVariableNetwork.cs" />
     
    246256    <None Include="Properties\AssemblyInfo.cs.frame" />
    247257    <EmbeddedResource Include="Regression\Data\RegressionRealWorld.zip" />
     258    <EmbeddedResource Include="Regression\Data\MibaFriction.zip" />
    248259  </ItemGroup>
    249260  <ItemGroup>
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs

    r14789 r15196  
    3737    }
    3838
    39     // TODO: include string variables after factor branch integration
    4039    protected override string[] AllowedInputVariables {
    41       get { return new string[] { /* "Material_Cat", */
     40      get { return new string[] { "Material_Cat",
    4241        "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    43         /* "Material", "Grooving", "Oil", */                                           
     42        "Material", "Grooving", "Oil",
    4443        "x17", "x20", "x22" }; }
    4544    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

    r14790 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
    43         "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     41      get { return new string[] { "Material_Cat",
     42        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
    43         /*"Source1", "Source2",*/ "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     41      get { return new string[] { "Material_Cat",
     42        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs

    r14790 r15196  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new CF1());
    50       descriptorList.Add(new CF2());
    51       descriptorList.Add(new CF3());
    52       descriptorList.Add(new CF4());
    53       descriptorList.Add(new NvhRating());
    54       descriptorList.Add(new Temp1());
    55       descriptorList.Add(new Temp2());
    56       descriptorList.Add(new Wear1());
    57       descriptorList.Add(new Wear2());
    58       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
    59       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
    60         using (var solutionsZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName), ZipArchiveMode.Read)) {
    61           IList<string> entries = new List<string>();
    62           foreach (var curEntry in solutionsZipFile.Entries) {
    63             entries.Add(curEntry.Name);
    64           }
    65           foreach (var entry in entries.OrderBy(x => x)) {
    66             string prettyName = Path.GetFileNameWithoutExtension(entry);
    67             ResourceRegressionDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
    68             if (desc != null) {
    69               desc.ResourceName = entry;
    70               yield return desc;
    71             } else
    72               throw new ArgumentNullException("No descriptor could be found for this entry.");
    73           }
    74         }
    75       }
     49      descriptorList.Add(new CF1() { ResourceName = "CF1.csv" });
     50      descriptorList.Add(new CF2() { ResourceName = "CF2.csv" });
     51      descriptorList.Add(new CF3() { ResourceName = "CF3.csv" });
     52      descriptorList.Add(new CF4() { ResourceName = "CF4.csv" });
     53      descriptorList.Add(new NvhRating() { ResourceName = "NvhRating.csv" });
     54      descriptorList.Add(new Temp1() { ResourceName = "Temp1.csv" });
     55      descriptorList.Add(new Temp2() { ResourceName = "Temp2.csv" });
     56      descriptorList.Add(new Wear1() { ResourceName = "Wear1.csv" });
     57      descriptorList.Add(new Wear2() { ResourceName = "Wear2.csv" });
     58
     59      return descriptorList;
    7660    }
    7761  }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x21", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

    r14791 r15196  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs

    r14186 r15196  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new ChemicalOne());
    50       descriptorList.Add(new Housing());
    51       descriptorList.Add(new Tower());
    52       descriptorList.Add(new Powermeter());
    53       descriptorList.Add(new SARCOS());
    54       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
    55       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
    56         using (var solutionsZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName), ZipArchiveMode.Read)) {
    57           IList<string> entries = new List<string>();
    58           foreach (var curEntry in solutionsZipFile.Entries) {
    59             entries.Add(curEntry.Name);
    60           }
    61           foreach (var entry in entries.OrderBy(x => x)) {
    62             string prettyName = Path.GetFileNameWithoutExtension(entry);
    63             ResourceRegressionDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
    64             if (desc != null) {
    65               desc.ResourceName = entry;
    66               yield return desc;
    67             } else
    68               throw new ArgumentNullException("No Descriptor could be found for this entry.");
    69           }
    70         }
    71       }
     49      descriptorList.Add(new ChemicalOne() { ResourceName = "Chemical-I.csv" });
     50      descriptorList.Add(new Housing() { ResourceName = "Housing.csv" });
     51      descriptorList.Add(new Tower() { ResourceName = "Tower.txt" });
     52      descriptorList.Add(new Powermeter() { ResourceName = "Powermeter.txt" });
     53      descriptorList.Add(new SARCOS() { ResourceName = "SARCOS - Inverse Dynamics.txt" });
     54      return descriptorList;
    7255    }
    7356  }
Note: See TracChangeset for help on using the changeset viewer.