Context Navigation

Changeset 14825 for branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Timestamp:

04/04/17 16:57:45 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14769:14820 from trunk to branch to prepare for branch reintegration

Location:

branches/symbreg-factors-2650

Files:

branches/symbreg-factors-2650
- Property svn:mergeinfo changed
  /trunk/sources merged: 14769-14770,14772-14775,14779-14781,14786,14789-14791,14793,14805,14809-14810,14817,14819-14820
branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged: 14789-14791

-                      r14751
+                      r14825
     <Compile Include="Regression\FeatureSelection\FeatureSelection.cs" />
     <Compile Include="Regression\FeatureSelection\FeatureSelectionInstanceProvider.cs" />
+    <Compile Include="Regression\MibaFriction\CF3.cs" />
+    <Compile Include="Regression\MibaFriction\Wear1.cs" />
+    <Compile Include="Regression\MibaFriction\Wear2.cs" />
+    <Compile Include="Regression\MibaFriction\Temp2.cs" />
+    <Compile Include="Regression\MibaFriction\Temp1.cs" />
+    <Compile Include="Regression\MibaFriction\NvhRating.cs" />
+    <Compile Include="Regression\MibaFriction\CF4.cs" />
+    <Compile Include="Regression\MibaFriction\CF2.cs" />
+    <Compile Include="Regression\MibaFriction\CF1.cs" />
+    <Compile Include="Regression\MibaFriction\MibaFrictionRegressionInstanceProvider.cs" />
     <Compile Include="Regression\VariableNetworks\LinearVariableNetwork.cs" />
     <Compile Include="Regression\VariableNetworks\GaussianProcessVariableNetwork.cs" />
 …
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <EmbeddedResource Include="Regression\Data\RegressionRealWorld.zip" />
+    <EmbeddedResource Include="Regression\Data\MibaFriction.zip" />
   </ItemGroup>
   <ItemGroup>

Note: See TracChangeset for help on using the changeset viewer.