From 04f64e02921a75ee244d6dba1531a6dd914c5ff9 Mon Sep 17 00:00:00 2001 From: Villu Ruusmann Date: Sun, 29 Jul 2018 23:02:23 +0300 Subject: [PATCH] Reordered fields and methods --- .../java/org/jpmml/evaluator/JavaModel.java | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/JavaModel.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/JavaModel.java index 19ad2f7b..010808b7 100644 --- a/pmml-evaluator/src/main/java/org/jpmml/evaluator/JavaModel.java +++ b/pmml-evaluator/src/main/java/org/jpmml/evaluator/JavaModel.java @@ -53,16 +53,16 @@ public class JavaModel extends Model { private MiningSchema miningSchema = null; - private LocalTransformations localTransformations = null; - - private Targets targets = null; - private Output output = null; private ModelStats modelStats = null; private ModelExplanation modelExplanation = null; + private Targets targets = null; + + private LocalTransformations localTransformations = null; + private ModelVerification modelVerification = null; @@ -81,11 +81,11 @@ public JavaModel(Model model){ setScorable(model.isScorable()); setMathContext(model.getMathContext()); setMiningSchema(model.getMiningSchema()); - setLocalTransformations(model.getLocalTransformations()); - setTargets(model.getTargets()); setOutput(model.getOutput()); setModelStats(model.getModelStats()); setModelExplanation(model.getModelExplanation()); + setTargets(model.getTargets()); + setLocalTransformations(model.getLocalTransformations()); setModelVerification(model.getModelVerification()); } @@ -175,61 +175,61 @@ public JavaModel setMiningSchema(@Property("miningSchema") MiningSchema miningSc } @Override - public LocalTransformations getLocalTransformations(){ - return this.localTransformations; + public Output getOutput(){ + return this.output; } @Override - public JavaModel setLocalTransformations(@Property("localTransformations") LocalTransformations localTransformations){ - this.localTransformations = localTransformations; + public JavaModel setOutput(@Property("output") Output output){ + this.output = output; return this; } @Override - public Targets getTargets(){ - return this.targets; + public ModelStats getModelStats(){ + return this.modelStats; } @Override - public JavaModel setTargets(@Property("targets") Targets targets){ - this.targets = targets; + public JavaModel setModelStats(@Property("modelStats") ModelStats modelStats){ + this.modelStats = modelStats; return this; } @Override - public Output getOutput(){ - return this.output; + public ModelExplanation getModelExplanation(){ + return this.modelExplanation; } @Override - public JavaModel setOutput(@Property("output") Output output){ - this.output = output; + public JavaModel setModelExplanation(@Property("modelExplanation") ModelExplanation modelExplanation){ + this.modelExplanation = modelExplanation; return this; } @Override - public ModelStats getModelStats(){ - return this.modelStats; + public Targets getTargets(){ + return this.targets; } @Override - public JavaModel setModelStats(@Property("modelStats") ModelStats modelStats){ - this.modelStats = modelStats; + public JavaModel setTargets(@Property("targets") Targets targets){ + this.targets = targets; return this; } @Override - public ModelExplanation getModelExplanation(){ - return this.modelExplanation; + public LocalTransformations getLocalTransformations(){ + return this.localTransformations; } @Override - public JavaModel setModelExplanation(@Property("modelExplanation") ModelExplanation modelExplanation){ - this.modelExplanation = modelExplanation; + public JavaModel setLocalTransformations(@Property("localTransformations") LocalTransformations localTransformations){ + this.localTransformations = localTransformations; return this; } @@ -253,7 +253,7 @@ public VisitorAction accept(Visitor visitor){ if(status == VisitorAction.CONTINUE){ visitor.pushParent(this); - status = PMMLObject.traverse(visitor, getMiningSchema(), getLocalTransformations(), getTargets(), getOutput(), getModelStats(), getModelExplanation(), getModelVerification()); + status = PMMLObject.traverse(visitor, getMiningSchema(), getOutput(), getModelStats(), getModelExplanation(), getTargets(), getLocalTransformations(), getModelVerification()); visitor.popParent(); } // End if