Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4b44abf

Browse files
committedSep 24, 2019
including signed native nuget package. Null fix
1 parent e5d407c commit 4b44abf

File tree

4 files changed

+7
-21
lines changed

4 files changed

+7
-21
lines changed
 

‎src/Microsoft.ML.Featurizers/TimeSeriesImputer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ internal TimeSeriesImputerEstimator(IHostEnvironment env, string timeSeriesColum
107107
_host = Contracts.CheckRef(env, nameof(env)).Register("TimeSeriesImputerEstimator");
108108
_host.CheckValue(timeSeriesColumn, nameof(timeSeriesColumn), "TimePoint column should not be null.");
109109
_host.CheckNonEmpty(grainColumns, nameof(grainColumns), "Need at least one grain column.");
110-
if(filterMode == FilterMode.Include)
110+
if (filterMode == FilterMode.Include)
111111
_host.CheckNonEmpty(filterColumns, nameof(filterColumns), "Need at least 1 filter column if a FilterMode is specified");
112112

113113
_options = new Options
114114
{
115115
TimeSeriesColumn = timeSeriesColumn,
116116
GrainColumns = grainColumns,
117-
FilterColumns = filterColumns == null? new string[] { } : filterColumns,
117+
FilterColumns = filterColumns == null ? new string[] { } : filterColumns,
118118
FilterMode = filterMode,
119119
ImputeMode = imputeMode,
120120
SupressTypeErrors = supressTypeErrors
@@ -262,7 +262,7 @@ private unsafe TransformerEstimatorSafeHandle CreateTransformerFromSavedData(byt
262262
if (!result)
263263
throw new Exception(CommonExtensions.GetErrorDetailsAndFreeNativeMemory(errorHandle));
264264

265-
return new TransformerEstimatorSafeHandle(transformer, DestroyTransformerNative);
265+
return new TransformerEstimatorSafeHandle(transformer, DestroyTransformerNative);
266266
}
267267
}
268268

Binary file not shown.

‎test/Microsoft.ML.Tests/Transformers/DateTimeTransformerTests.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,6 @@ public void HolidayTest()
257257
Assert.Equal("Christmas Day", row[20].Value.ToString()); // HolidayName
258258
Assert.Equal((byte)0, row[21].Value); // IsPaidTimeOff
259259

260-
mlContext.Model.Save(model, data.Schema, "D:/Repos/machinelearning/temp-nuget-folder/model.zip");
261-
var loadedModel = mlContext.Model.Load("D:/Repos/machinelearning/temp-nuget-folder/model.zip", out DataViewSchema loadedSchema);
262-
263-
var loadedOutput = loadedModel.Transform(data);
264-
var loadedRow = loadedOutput.Preview(1).RowView[0].Values;
265-
266-
// Assert the data from the first row from loaded data for holidays is what we expect
267-
Assert.Equal("Christmas Day", loadedRow[20].Value.ToString()); // HolidayName
268-
Assert.Equal((byte)0, loadedRow[21].Value); // IsPaidTimeOff
269-
270-
271260
TestEstimatorCore(pipeline, data);
272261
Done();
273262
}

‎test/Microsoft.ML.Tests/Transformers/TimeSeriesImputerTests.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,8 @@ public void DropOneColumn()
6060
var model = pipeline.Fit(data);
6161
var output = model.Transform(data);
6262
var schema = output.Schema;
63-
var outputSchema = model.GetOutputSchema(data.Schema);
64-
output.Preview();
6563

66-
//Assert.Equal(6, schema.Count);
64+
Assert.Equal(6, schema.Count);
6765

6866
TestEstimatorCore(pipeline, data);
6967
Done();
@@ -141,12 +139,11 @@ public void Median()
141139
var pipeline = mlContext.Transforms.TimeSeriesImputer("date", new string[] { "grainA" }, imputeMode: TimeSeriesImputerEstimator.ImputationStrategy.Median, filterColumns: null, suppressTypeErrors: true);
142140
var model = pipeline.Fit(data);
143141

144-
dataList = new[] { new TimeSeriesOneGrainFloatInput() { date = 0, grainA = "B", dataA = float.NaN },
145-
new TimeSeriesOneGrainFloatInput() { date = 1, grainA = "B", dataA = 2 }};
142+
var dataListNewGrain = new[] { new TimeSeriesOneGrainFloatInput() { date = 0, grainA = "B", dataA = float.NaN } };
146143

147-
data = mlContext.Data.LoadFromEnumerable(dataList);
144+
var dataNewGrain = mlContext.Data.LoadFromEnumerable(dataListNewGrain);
148145

149-
var output = model.Transform(data);
146+
var output = model.Transform(dataNewGrain);
150147

151148
var prev = output.Preview();
152149

0 commit comments

Comments
 (0)
Please sign in to comment.