Permalink
Browse files

PMML : Upgrade schema to version 4.1

  • Loading branch information...
1 parent 96d5bcd commit c47d35e1f49cd74351f904e7335047010f62cc94 @sotty sotty committed Sep 22, 2012
Showing with 5,043 additions and 5,315 deletions.
  1. +4 −4 drools-pmml/pom.xml
  2. +1 −1 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/ModelMarker.java
  3. +1 −1 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/PMML4AbstractField.java
  4. +28 −23 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/PMML4Compiler.java
  5. +1 −1 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/PMML4Field.java
  6. +2 −2 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/PMML4Wrapper.java
  7. +3 −3 drools-pmml/src/main/java/org/drools/{pmml_4_0 → pmml_4_1}/PMMLGeneratorUtils.java
  8. +5 −4 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/pmml_compiler.drl
  9. +4 −4 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/pmml_informer.drl
  10. +4 −4 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/pmml_visitor.drl
  11. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/commonQueries.drlt
  12. 0 ...l/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/common.drlt
  13. 0 .../main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/inputFromEP.drlt
  14. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/ioTrait.drlt
  15. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/ioTypeDeclare.drlt
  16. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/rootDataField.drlt
  17. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/dataDefinition/updateIOField.drlt
  18. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/manipulation/confirm.drlt
  19. 0 ...in/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/manipulation/mapMissingValues.drlt
  20. 0 ...ources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/manipulation/propagateMissingValues.drlt
  21. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/modelMark.drlt
  22. +2 −2 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/pmml_header.drlt
  23. 0 ...es/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/validation/intervalsOnDomainRestriction.drlt
  24. 0 ...urces/org/drools/{pmml_4_0 → pmml_4_1}/templates/global/validation/valuesOnDomainRestriction.drlt
  25. 0 ...rg/drools/{pmml_4_0 → pmml_4_1}/templates/global/validation/valuesOnDomainRestrictionInvalid.drlt
  26. 0 ...rg/drools/{pmml_4_0 → pmml_4_1}/templates/global/validation/valuesOnDomainRestrictionMissing.drlt
  27. 0 ...sources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelAddQuestionsToQuestionnaire.drlt
  28. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelCreateByBinding.drlt
  29. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelInvalidAnswer.drlt
  30. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelMultiQuestion.drlt
  31. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelOutputBinding.drlt
  32. 0 ...ls-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelQuestion.drlt
  33. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelQuestionBinding.drlt
  34. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelQuestionRebinding.drlt
  35. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelQuestionnaire.drlt
  36. 0 ...-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/informer/modelRevalidate.drlt
  37. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/clustering/clusteringDeclare.drlt
  38. 0 ...esources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/clustering/clusteringEvalDistance.drlt
  39. 0 ...ources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/clustering/clusteringEvalSimilarity.drlt
  40. 0 ...c/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/clustering/clusteringInit.drlt
  41. 0 ...sources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/clustering/clusteringMatrixCompare.drlt
  42. 0 ...c/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningField.drlt
  43. 0 ...resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningFieldInvalid.drlt
  44. 0 ...resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningFieldMissing.drlt
  45. 0 ...g/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningFieldOutlierAsExtremeLow.drlt
  46. 0 ...g/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningFieldOutlierAsExtremeUpp.drlt
  47. 0 .../org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/mining/miningFieldOutlierAsMissing.drlt
  48. 0 ...n/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/target/addOutputFeature.drlt
  49. 0 ...main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/target/aliasedOutput.drlt
  50. 0 ...main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/common/target/targetReshape.drlt
  51. 0 ...pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralBeans.drlt
  52. 0 .../main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralBuildSynapses.drlt
  53. 0 ...pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralClean.drlt
  54. 0 ...-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralFire.drlt
  55. 0 ...sources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralLayerMaxNormalization.drlt
  56. 0 ...ces/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralLayerSoftMaxNormalization.drlt
  57. 0 ...c/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralLinkSynapses.drlt
  58. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralOutputField.drlt
  59. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralOutputQuery.drlt
  60. 0 ...esources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralOutputQueryPredicate.drlt
  61. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/neural/neuralWireInput.drlt
  62. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regClaxOutput.drlt
  63. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regCommon.drlt
  64. 0 ...l/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regDeclare.drlt
  65. 0 .../main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regDecumulation.drlt
  66. 0 ...pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regEval.drlt
  67. 0 ...main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regNormalization.drlt
  68. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/regression/regParams.drlt
  69. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmBuild.drlt
  70. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmDeclare.drlt
  71. 0 ...s-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmFunctions.drlt
  72. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmInitInputVector.drlt
  73. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmInitSupportVector.drlt
  74. 0 ...-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmKernelEval.drlt
  75. 0 ...src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmOutputGeneration.drlt
  76. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmOutputVote1v1.drlt
  77. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmOutputVote1vN.drlt
  78. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmOutputVoteDeclare.drlt
  79. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/svm/svmParams.drlt
  80. 0 .../src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeAggregateEval.drlt
  81. 0 ...ls-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeCommon.drlt
  82. 0 ...s-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeDeclare.drlt
  83. 0 ...ml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeDefaultEval.drlt
  84. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeEval.drlt
  85. 0 ...pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeIOBinding.drlt
  86. 0 drools-pmml/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeInit.drlt
  87. 0 ...l/src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeInputDeclare.drlt
  88. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeMissHandleAggregate.drlt
  89. 0 ...src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeMissHandleLast.drlt
  90. 0 ...src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeMissHandleNone.drlt
  91. 0 ...src/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeMissHandleNull.drlt
  92. 0 ...main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/models/tree/treeMissHandleWeighted.drlt
  93. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/aggregate/aggregate.drlt
  94. 0 .../main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/aggregate/collect.drlt
  95. 0 ...ources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/discretize/intervalBinning.drlt
  96. 0 ...es/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/discretize/outOfBinningDefault.drlt
  97. 0 ...es/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/discretize/outOfBinningMissing.drlt
  98. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/functions/apply.drlt
  99. 0 ...main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/functions/function.drlt
  100. 0 ...rc/main/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/mapping/mapping.drlt
  101. 0 ...g/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/normContinuous/boundedLowerOutliers.drlt
  102. 0 ...g/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/normContinuous/boundedUpperOutliers.drlt
  103. 0 ...ools/{pmml_4_0 → pmml_4_1}/templates/transformations/normContinuous/linearTractNormalization.drlt
  104. 0 ... pmml_4_1}/templates/transformations/normContinuous/lowerExtrapolateLinearTractNormalization.drlt
  105. 0 ...ols/{pmml_4_0 → pmml_4_1}/templates/transformations/normContinuous/normContOutliersAsMissing.drlt
  106. 0 ... pmml_4_1}/templates/transformations/normContinuous/upperExtrapolateLinearTractNormalization.drlt
  107. 0 ...ces/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/normDiscrete/indicatorFieldNo.drlt
  108. 0 ...es/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/normDiscrete/indicatorFieldYes.drlt
  109. 0 ...urces/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/normDiscrete/predicateField.drlt
  110. 0 ...ain/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/simple/aliasedField.drlt
  111. 0 ...in/resources/org/drools/{pmml_4_0 → pmml_4_1}/templates/transformations/simple/constantField.drlt
  112. +1 −1 drools-pmml/src/main/resources/xjb/bindings.xjb
  113. +0 −2,964 drools-pmml/src/main/resources/xsd/org/drools/pmml_4_0/pmml-4-0.xsd
  114. 0 drools-pmml/src/main/resources/xsd/org/drools/{pmml_4_0 → pmml_4_1}/bindings.xml
  115. +3,370 −0 drools-pmml/src/main/resources/xsd/org/drools/pmml_4_1/pmml-4-1.xsd
  116. +4 −7 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/DroolsAbstractPMMLTest.java
  117. +7 −7 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/PMMLGenerationTest.java
  118. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/global/ConstrainedDataDictionaryTest.java
  119. +10 −10 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/global/DataDictionaryTest.java
  120. +6 −6 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/global/HeaderTest.java
  121. +14 −14 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/informer/QuestionnaireTest.java
  122. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/MiningSchemaTest.java
  123. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/TargetsAndOutputsTest.java
  124. +9 −12 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/CleanupTest.java
  125. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/ClusteringTest.java
  126. +15 −21 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/DecisionTreeTest.java
  127. +11 −21 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/MultipleModelTest.java
  128. +18 −20 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/NeuralNetworkTest.java
  129. +6 −7 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/SVMTest.java
  130. +5 −5 ...s-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/predictive/models/SimpleRegressionTest.java
  131. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/AggregateFieldsTest.java
  132. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/AliasedFieldsTest.java
  133. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/DiscretizeFieldsTest.java
  134. +5 −5 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/FunctionsTest.java
  135. +4 −4 ...-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/FunctionsWithNestedTest.java
  136. +4 −4 ...ml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/LinearNormalizedFieldsTest.java
  137. +4 −4 drools-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/MapValuesTest.java
  138. +4 −4 ...s-pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/NormDiscreteFieldsTest.java
  139. +4 −4 ...mml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/UserDefinedFunctions2Test.java
  140. +4 −4 ...pmml/src/test/java/org/drools/{pmml_4_0 → pmml_4_1}/transformations/UserDefinedFunctionsTest.java
  141. +0 −559 drools-pmml/src/test/resources/org/drools/pmml_4_0/smartvent.xml
  142. +0 −130 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_ann_iris.xml
  143. +0 −140 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_ann_iris_v2.xml
  144. +0 −91 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_clustering.xml
  145. +0 −47 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_data_dic.xml
  146. +0 −35 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_derived_fields_aggregate.xml
  147. +0 −33 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_derived_fields_alias.xml
  148. +0 −36 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_derived_fields_normDiscrete.xml
  149. +0 −27 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_header.xml
  150. +0 −52 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_regression.xml
  151. +0 −66 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_regression_clax.xml
  152. +0 −80 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_svm.xml
  153. +0 −90 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_svm_1v1.xml
  154. +0 −82 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_svm_1vN.xml
  155. +0 −64 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_tree_missing.xml
  156. +0 −86 drools-pmml/src/test/resources/org/drools/pmml_4_0/test_tree_simple.xml
  157. +3 −3 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/ann_rules.drl
  158. +9 −44 .../src/test/resources/org/drools/{pmml_4_0/mock_breastcancer.pmml → pmml_4_1/mock_breastcancer.xml}
  159. +8 −40 drools-pmml/src/test/resources/org/drools/{pmml_4_0/mock_cold.pmml → pmml_4_1/mock_cold.xml}
  160. +15 −51 drools-pmml/src/test/resources/org/drools/{pmml_4_0/mock_ptsd.pmml → pmml_4_1/mock_ptsd.xml}
  161. +5 −34 ...s-pmml/src/test/resources/org/drools/{pmml_4_0/mock_ptsd_diag.pmml → pmml_4_1/mock_ptsd_diag.xml}
  162. +542 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/smartvent.xml
  163. +113 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_ann_iris.xml
  164. +9 −29 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_ann_iris_prediction.xml
  165. +122 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_ann_iris_v2.xml
  166. +18 −53 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_ann_mixed_inputs.xml
  167. +8 −28 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_ann_mixed_inputs2.xml
  168. +4 −21 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_ann_regression.xml
  169. +63 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_clustering.xml
  170. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_constr_data_dic.xml
  171. +30 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_data_dic.xml
  172. +17 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_derived_fields_aggregate.xml
  173. +16 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_derived_fields_alias.xml
  174. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_derived_fields_discretize.xml
  175. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_derived_fields_linearNorm.xml
  176. +1 −1 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_derived_fields_mapvalues.xml
  177. +19 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_derived_fields_normDiscrete.xml
  178. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_functions.xml
  179. +1 −18 ...pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_functions_nested_transformation.xml
  180. +10 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_header.xml
  181. +11 −42 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_miningSchema.xml
  182. +30 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_regression.xml
  183. +44 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_regression_clax.xml
  184. +63 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_svm.xml
  185. +73 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_svm_1v1.xml
  186. +65 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_svm_1vN.xml
  187. +7 −24 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_target_and_output.xml
  188. +63 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_tree_missing.xml
  189. +80 −0 drools-pmml/src/test/resources/org/drools/pmml_4_1/test_tree_simple.xml
  190. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_user_functions.xml
  191. +1 −18 drools-pmml/src/test/resources/org/drools/{pmml_4_0 → pmml_4_1}/test_user_functions2.xml
View
@@ -102,8 +102,8 @@
</executions>
<configuration>
<outputDirectory>${basedir}/target/generated-sources/java</outputDirectory>
- <packageName>org.drools.pmml_4_0.descr</packageName>
- <schemaDirectory>${basedir}/src/main/resources/xsd/org/drools/pmml_4_0</schemaDirectory>
+ <packageName>org.drools.pmml_4_1.descr</packageName>
+ <schemaDirectory>${basedir}/src/main/resources/xsd/org/drools/pmml_4_1</schemaDirectory>
<bindingDirectory>${basedir}/src/main/resources/xjb</bindingDirectory>
<extension>true</extension>
<clearOutputDir>false</clearOutputDir>
@@ -124,10 +124,10 @@
</executions>
<configuration>
<schemas>
- <value>src/main/xsd/org/drools/pmml_4_0/pmml-4-0.xsd</value>
+ <value>src/main/xsd/org/drools/pmml_4_1/pmml-4-0.xsd</value>
</schemas>
<packageName>
- org.drools.pmml_4_0.descr
+ org.drools.pmml_4_1.descr
</packageName>
<bindings>
<value>
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
import org.drools.definition.type.Position;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
public abstract class PMML4AbstractField implements PMML4Field {
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
@@ -23,9 +23,8 @@
import org.drools.compiler.PackageRegistry;
import org.drools.conf.EventProcessingOption;
import org.drools.io.ResourceFactory;
-import org.drools.pmml_4_0.descr.*;
+import org.drools.pmml_4_1.descr.*;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.runtime.rule.FactHandle;
import org.mvel2.templates.SimpleTemplateRegistry;
import org.mvel2.templates.TemplateCompiler;
import org.mvel2.templates.TemplateRegistry;
@@ -41,7 +40,7 @@
public class PMML4Compiler implements org.drools.compiler.PMMLCompiler {
- public static final String PMML = "org.drools.pmml_4_0.descr";
+ public static final String PMML = "org.drools.pmml_4_1.descr";
public static final String BASE_PACK = PMML4Compiler.class.getPackage().getName().replace('.','/');
@@ -223,7 +222,7 @@
public PMML4Compiler() {
super();
helper = new PMML4Wrapper();
- helper.setPack( "org.drools.pmml_4_0.test" );
+ helper.setPack( "org.drools.pmml_4_1.test" );
}
@@ -318,7 +317,7 @@ private static void checkBuildingResources( PMML pmml ) {
initVisitor();
}
- for ( Object o : pmml.getAssociationModelsAndClusteringModelsAndGeneralRegressionModels() ) {
+ for ( Object o : pmml.getAssociationModelsAndBaselineModelsAndClusteringModels() ) {
if ( ! neuralLoaded && o instanceof NeuralNetwork ) {
@@ -357,30 +356,36 @@ private static void checkBuildingResources( PMML pmml ) {
}
}
- for ( Object o : pmml.getAssociationModelsAndClusteringModelsAndGeneralRegressionModels() ) {
+ for ( Object o : pmml.getAssociationModelsAndBaselineModelsAndClusteringModels() ) {
List inner;
- if ( o instanceof NeuralNetwork ) {
- inner = ((NeuralNetwork) o).getExtensionsAndNeuralLayersAndNeuralInputs();
- } else if ( o instanceof MiningModel ) {
- inner = ((MiningModel) o).getExtensionsAndMiningSchemasAndOutputs();
+ if ( o instanceof AssociationModel ) {
+ inner = ((AssociationModel) o).getExtensionsAndMiningSchemasAndOutputs();
+ } else if ( o instanceof BaselineModel ) {
+ inner = ((BaselineModel) o).getExtensionsAndTestDistributionsAndMiningSchemas();
} else if ( o instanceof ClusteringModel ) {
inner = ((ClusteringModel) o).getExtensionsAndClustersAndComparisonMeasures();
- } else if ( o instanceof AssociationModel ) {
- inner = ((AssociationModel) o).getExtensionsAndMiningSchemasAndOutputs();
- } else if ( o instanceof SupportVectorMachineModel ) {
- inner = ((SupportVectorMachineModel) o).getExtensionsAndSupportVectorMachinesAndVectorDictionaries();
- } else if ( o instanceof RegressionModel ) {
- inner = ((RegressionModel) o).getExtensionsAndRegressionTablesAndMiningSchemas();
- } else if ( o instanceof NaiveBayesModel ) {
- inner = ((NaiveBayesModel) o).getExtensionsAndBayesOutputsAndBayesInputs();
- } else if ( o instanceof TextModel ) {
- inner = ((TextModel) o).getExtensionsAndDocumentTermMatrixesAndTextCorpuses();
- } else if ( o instanceof SequenceModel ) {
- inner = ((SequenceModel) o).getExtensionsAndSequencesAndMiningSchemas();
} else if ( o instanceof GeneralRegressionModel ) {
inner = ((GeneralRegressionModel) o).getExtensionsAndParamMatrixesAndPPMatrixes();
+ } else if ( o instanceof MiningModel ) {
+ inner = ((MiningModel) o).getExtensionsAndMiningSchemasAndOutputs();
+ } else if ( o instanceof NaiveBayesModel ) {
+ inner = ((NaiveBayesModel) o).getExtensionsAndBayesOutputsAndBayesInputs();
+ } else if ( o instanceof NearestNeighborModel ) {
+ inner = ((NearestNeighborModel) o).getExtensionsAndKNNInputsAndComparisonMeasures();
+ } else if ( o instanceof NeuralNetwork ) {
+ inner = ((NeuralNetwork) o).getExtensionsAndNeuralLayersAndNeuralInputs();
+ } else if ( o instanceof RegressionModel ) {
+ inner = ((RegressionModel) o).getExtensionsAndRegressionTablesAndMiningSchemas();
} else if ( o instanceof RuleSetModel ) {
inner = ((RuleSetModel) o).getExtensionsAndRuleSetsAndMiningSchemas();
+ } else if ( o instanceof Scorecard ) {
+ inner = ((Scorecard) o).getExtensionsAndCharacteristicsAndMiningSchemas();
+ } else if ( o instanceof SequenceModel ) {
+ inner = ((SequenceModel) o).getExtensionsAndSequencesAndMiningSchemas();
+ } else if ( o instanceof SupportVectorMachineModel ) {
+ inner = ((SupportVectorMachineModel) o).getExtensionsAndSupportVectorMachinesAndVectorDictionaries();
+ } else if ( o instanceof TextModel ) {
+ inner = ((TextModel) o).getExtensionsAndDocumentTermMatrixesAndTextCorpuses();
} else if ( o instanceof TimeSeriesModel ) {
inner = ((TimeSeriesModel) o).getExtensionsAndMiningSchemasAndOutputs();
} else if ( o instanceof TreeModel ) {
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
public interface PMML4Field {
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
import org.drools.base.TypeResolver;
-import org.drools.pmml_4_0.descr.*;
+import org.drools.pmml_4_1.descr.*;
import java.io.*;
import java.text.SimpleDateFormat;
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0;
+package org.drools.pmml_4_1;
-import org.drools.pmml_4_0.descr.*;
+import org.drools.pmml_4_1.descr.*;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
@@ -249,7 +249,7 @@ public static PMML generateSimpleNeuralNetwork( String modelName,
nnet.getExtensionsAndNeuralLayersAndNeuralInputs().add( finalOuts );
- pmml.getAssociationModelsAndClusteringModelsAndGeneralRegressionModels().add(nnet);
+ pmml.getAssociationModelsAndBaselineModelsAndClusteringModels().add( nnet );
return pmml;
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.drools.pmml_4_0.compiler;
+package org.drools.pmml_4_1.compiler;
-import org.drools.pmml_4_0.descr.*;
-import org.drools.pmml_4_0.ModelMarker;
+import org.drools.pmml_4_1.descr.*;
+import org.drools.pmml_4_1.ModelMarker;
import org.mvel2.templates.*;
import java.util.Collections;
import java.util.Map;
@@ -27,7 +27,7 @@ import java.util.LinkedList;
global StringBuilder theory;
global TemplateRegistry registry;
global java.util.Map fld2var;
-global org.drools.pmml_4_0.PMML4Wrapper utils;
+global org.drools.pmml_4_1.PMML4Wrapper utils;
@@ -3073,3 +3073,4 @@ then
retract( $qm );
end
+
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0.compiler;
+package org.drools.pmml_4_1.compiler;
-import org.drools.pmml_4_0.descr.*;
-import org.drools.pmml_4_0.*;
+import org.drools.pmml_4_1.descr.*;
+import org.drools.pmml_4_1.*;
import org.mvel2.templates.*;
import java.util.Map;
import java.util.HashMap;
@@ -27,7 +27,7 @@ import java.util.LinkedList;
global StringBuilder theory;
global TemplateRegistry registry;
global Map fld2var;
-global org.drools.pmml_4_0.PMML4Wrapper utils;
+global org.drools.pmml_4_1.PMML4Wrapper utils;
declare EnableSurvey
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.drools.pmml_4_0.compiler;
+package org.drools.pmml_4_1.compiler;
-import org.drools.pmml_4_0.descr.*;
-import org.drools.pmml_4_0.*;
+import org.drools.pmml_4_1.descr.*;
+import org.drools.pmml_4_1.*;
import java.util.Map;
import java.util.LinkedHashMap;
@@ -382,7 +382,7 @@ end
rule "visitModels"
salience -50
when
- PMML( $modelList : associationModelsAndClusteringModelsAndGeneralRegressionModels )
+ PMML( $modelList : associationModelsAndBaselineModelsAndClusteringModels )
$model : Object() from $modelList
then
insert( $model );
@@ -34,8 +34,8 @@
package @{pack};
-import org.drools.pmml_4_0.ModelMarker;
-import org.drools.pmml_4_0.PMML4AbstractField;
+import org.drools.pmml_4_1.ModelMarker;
+import org.drools.pmml_4_1.PMML4AbstractField;
import org.drools.informer.Group;
import org.drools.informer.InvalidAnswer;
@@ -33,7 +33,7 @@ version="2.1">
</globalBindings>
- <bindings schemaLocation="../xsd/org/drools/pmml_4_0/pmml-4-0.xsd" node="/xs:schema">
+ <bindings schemaLocation="../xsd/org/drools/pmml_4_1/pmml-4-1.xsd" node="/xs:schema">
<bindings node=".//xs:simpleType[@name='DELIMITER']">
<typesafeEnumClass name = "ENUM_DELIMITER"/>
Oops, something went wrong.

0 comments on commit c47d35e

Please sign in to comment.