Skip to content

Commit a3a0302

Browse files
committed
Moving validation/checking of arguments to relevant blocks.
1 parent 76bab69 commit a3a0302

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/Microsoft.ML.Data/Transforms/TrainAndScoreTransform.cs

+11-5
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,13 @@ public sealed class Arguments : ArgumentsBase<SignatureTrainer>
165165
/// <param name="featureColumn">Role name for features.</param>
166166
/// <param name="labelColumn">Role name for label.</param>
167167
/// <returns></returns>
168-
public static IDataTransform Create(IHostEnvironment env, IDataView input, ITrainer trainer, string featureColumn = DefaultColumnNames.Features, string labelColumn = DefaultColumnNames.Label)
168+
public static IDataTransform Create(IHostEnvironment env,
169+
IDataView input,
170+
ITrainer trainer,
171+
string featureColumn = DefaultColumnNames.Features,
172+
string labelColumn = DefaultColumnNames.Label)
169173
{
174+
Contracts.CheckValue(env, nameof(env));
170175
var args = new Arguments()
171176
{
172177
FeatureColumn = featureColumn,
@@ -178,16 +183,17 @@ public static IDataTransform Create(IHostEnvironment env, IDataView input, ITrai
178183

179184
public static IDataTransform Create(IHostEnvironment env, Arguments args, IDataView input)
180185
{
186+
Contracts.CheckValue(env, nameof(env));
187+
env.CheckValue(args, nameof(args));
188+
env.CheckUserArg(args.Trainer.IsGood(), nameof(args.Trainer),
189+
"Trainer cannot be null. If your model is already trained, please use ScoreTransform instead.");
190+
181191
return Create(env, args, args.Trainer.CreateInstance(env), input);
182192
}
183193

184194
private static IDataTransform Create(IHostEnvironment env, Arguments args, ITrainer trainer, IDataView input)
185195
{
186-
Contracts.CheckValue(env, nameof(env));
187-
env.CheckValue(args, nameof(args));
188196
env.CheckValue(input, nameof(input));
189-
env.CheckUserArg(args.Trainer.IsGood(), nameof(args.Trainer),
190-
"Trainer cannot be null. If your model is already trained, please use ScoreTransform instead.");
191197

192198
var host = env.Register("TrainAndScoreTransform");
193199

0 commit comments

Comments
 (0)