Context Navigation

← Previous Change
Next Change →

MibaFriction

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:

: 12 edited

. (modified) (3 props)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs (modified) (2 diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs (modified) (2 diffs)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2892_LR-prediction-intervals

Property svn:ignore

-                      old
+                      new
+*.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

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/stable (added)	merged: 15587-15588
/trunk (added)	merged: 15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382
/trunk/sources (added)	merged: 15589-15590

Property svn:global-ignores set to
*.nuget
packages

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

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 16057
/branches/2915-AbsoluteSymbol/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 16240,16332
/trunk/HeuristicLab.Problems.Instances.DataAnalysis (added)	merged: 15853,15855,15951-15952,16117,16169,16264,16356

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs

-                      r15583
+                      r16388
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class CF1 : ResourceRegressionDataDescriptor {
+    public override string Name { get { return "CF1"; } }
+    public CF1() : base("CF1.csv") { }
+    public override string Name { get { return "CF1"; } }
     public override string Description {
       get {
 …
     protected override string TargetVariable { get { return "Cf1"; } }
     protected override string[] VariableNames {
+      get { return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Cf1"
+ }; }
+      get {
+        return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Cf1"
+ };
+      }
+    }
     protected override string[] AllowedInputVariables {
+      get { return new string[] { "Material_Cat",
+      get {
+        return new string[] { "Material_Cat",
         "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         "Material", "Grooving", "Oil",
+        "x17", "x20", "x22" }; }
+        "x17", "x20", "x22" };
+      }
+    }
     protected override int TrainingPartitionStart { get { return 0; } }

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class CF2 : ResourceRegressionDataDescriptor {
	24	public CF2() : base("CF2.csv") { }
24	25	public override string Name { get { return "CF2"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class CF3 : ResourceRegressionDataDescriptor {
	24	public CF3() : base("CF3.csv") { }
24	25	public override string Name { get { return "CF3"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class CF4 : ResourceRegressionDataDescriptor {
	24	public CF4() : base("CF4.csv") { }
24	25	public override string Name { get { return "CF4"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs

-                      r15583
+                      r16388
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
       descriptorList.Add(new CF1() { ResourceName = "CF1.csv" });
       descriptorList.Add(new CF2() { ResourceName = "CF2.csv" });
       descriptorList.Add(new CF3() { ResourceName = "CF3.csv" });
       descriptorList.Add(new CF4() { ResourceName = "CF4.csv" });
       descriptorList.Add(new NvhRating() { ResourceName = "NvhRating.csv" });
       descriptorList.Add(new Temp1() { ResourceName = "Temp1.csv" });
       descriptorList.Add(new Temp2() { ResourceName = "Temp2.csv" });
       descriptorList.Add(new Wear1() { ResourceName = "Wear1.csv" });
       descriptorList.Add(new Wear2() { ResourceName = "Wear2.csv" });
+      descriptorList.Add(new CF1());
+      descriptorList.Add(new CF2());
+      descriptorList.Add(new CF3());
+      descriptorList.Add(new CF4());
+      descriptorList.Add(new NvhRating());
+      descriptorList.Add(new Temp1());
+      descriptorList.Add(new Temp2());
+      descriptorList.Add(new Wear1());
+      descriptorList.Add(new Wear2());
       return descriptorList;

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class NvhRating : ResourceRegressionDataDescriptor {
	24	public NvhRating() : base("NvhRating.csv") { }
24	25	public override string Name { get { return "NvhRating"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class Temp1 : ResourceRegressionDataDescriptor {
	24	public Temp1() : base("Temp1.csv") { }
24	25	public override string Name { get { return "Temp1"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class Temp2 : ResourceRegressionDataDescriptor {
	24	public Temp2() : base("Temp2.csv") { }
24	25	public override string Name { get { return "Temp2"; } }
25	26	public override string Description {

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

-                      r15583
+                      r16388
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class Wear1 : ResourceRegressionDataDescriptor {
+    public Wear1() : base("Wear1.csv") { }
     public override string Name { get { return "Wear1"; } }
     public override string Description {
 …
+    }
     protected override string TargetVariable { get { return "Wear1"; } }
     protected override string[] VariableNames {
       get { return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Wear1"

branches/2892_LR-prediction-intervals/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

r15583	r16388
22	22	namespace HeuristicLab.Problems.Instances.DataAnalysis {
23	23	public class Wear2 : ResourceRegressionDataDescriptor {
	24	public Wear2() : base("Wear2.csv") { }
24	25	public override string Name { get { return "Wear2"; } }
25	26	public override string Description {

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

Context Navigation

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

Legend:

Download in other formats: