Changeset 16388 for branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

12/15/18 12:36:08 (6 years ago)

Author:

gkronber

Message:

#2892: Merging r15750:16382 (HEAD) from trunk to branch, resolving conflicts

Location:

branches/2892_LR-prediction-intervals

Files:

• . (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Data/PennML.zip (copied) (copied from trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Data/PennML.zip) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/PennML (copied) (copied from trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/PennML) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Physics (copied) (copied from trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Physics) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/ChemicalOne.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Housing.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Powermeter.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/SARCOS.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Tower.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionDataDescriptor.cs (modified) (view diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs (modified) (view diffs)

branches/2892_LR-prediction-intervals

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

@@ +1 @@
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.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.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs