Skip to content

Commit bb2ad55

Browse files
author
Shahab Moradi
committed
Moved the static test
1 parent 1b18db5 commit bb2ad55

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

test/Microsoft.ML.StaticPipelineTesting/StaticPipeTests.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,5 +856,25 @@ public void TextNormalizeStatic()
856856
type = schema.GetColumnType(numbers);
857857
Assert.True(!type.IsVector && type.ItemType.IsText);
858858
}
859+
860+
[Fact]
861+
public void TestPcaStatic()
862+
{
863+
var env = new ConsoleEnvironment(seed: 1);
864+
var dataSource = GetDataPath("generated_regression_dataset.csv");
865+
var reader = TextLoader.CreateReader(env,
866+
c => (label: c.LoadFloat(11), features: c.LoadFloat(0, 10)),
867+
separator: ';', hasHeader: true);
868+
var data = reader.Read(dataSource);
869+
var est = reader.MakeNewEstimator()
870+
.Append(r => (r.label, pca: r.features.ToPrincipalComponents(rank: 5)));
871+
var tdata = est.Fit(data).Transform(data);
872+
var schema = tdata.AsDynamic.Schema;
873+
874+
Assert.True(schema.TryGetColumnIndex("pca", out int pca));
875+
var type = schema[pca].Type;
876+
Assert.True(type.IsVector && type.ItemType.RawKind == DataKind.R4);
877+
Assert.True(type.VectorSize == 5);
878+
}
859879
}
860880
}

test/Microsoft.ML.Tests/Transformers/PcaTests.cs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public void PcaWorkout()
4242
var est = new PcaEstimator(_env, "features", "pca", rank: 4, seed: 10);
4343
TestEstimatorCore(est, data.AsDynamic, invalidInput: invalidData.AsDynamic);
4444

45-
var est_non_default_args = new PcaEstimator(_env, "features", "pca", rank: 3, weightColumn: "weight", overSampling: 2, center: false);
46-
TestEstimatorCore(est_non_default_args, data.AsDynamic, invalidInput: invalidData.AsDynamic);
45+
var estNonDefaultArgs = new PcaEstimator(_env, "features", "pca", rank: 3, weightColumn: "weight", overSampling: 2, center: false);
46+
TestEstimatorCore(estNonDefaultArgs, data.AsDynamic, invalidInput: invalidData.AsDynamic);
4747

4848
Done();
4949
}
@@ -70,29 +70,5 @@ public void TestPcaEstimator()
7070
CheckEquality("PCA", "pca.tsv");
7171
Done();
7272
}
73-
74-
[Fact]
75-
public void TestPcaPigsty()
76-
{
77-
var reader = TextLoader.CreateReader(_env,
78-
c => (label: c.LoadFloat(11), features1: c.LoadFloat(0, 10)),
79-
separator: ';', hasHeader: true);
80-
var data = reader.Read(_dataSource);
81-
var pipeline = reader.MakeNewEstimator()
82-
.Append(r => (r.label, pca: r.features1.ToPrincipalComponents(rank: 5, seed: 1)));
83-
84-
var outputPath = GetOutputPath("PCA", "pca.tsv");
85-
using (var ch = _env.Start("save"))
86-
{
87-
IDataView savedData = TakeFilter.Create(_env, pipeline.Fit(data).Transform(data).AsDynamic, 4);
88-
savedData = new ChooseColumnsTransform(_env, savedData, "pca");
89-
90-
using (var fs = File.Create(outputPath))
91-
DataSaverUtils.SaveDataView(ch, _saver, savedData, fs, keepHidden: true);
92-
}
93-
94-
CheckEquality("PCA", "pca.tsv", digitsOfPrecision: 5);
95-
Done();
96-
}
9773
}
9874
}

0 commit comments

Comments
 (0)