From a421b6486abd0ba655dedf66d2d807c2dfdbfb8a Mon Sep 17 00:00:00 2001 From: Mark Hall Date: Thu, 7 Nov 2019 14:24:04 +1300 Subject: [PATCH] PMI schemes and utilities now moved from the Spoon "Data Mining" folder to a new "PMI" folder. Version is now at 1.5. --- pom.xml | 2 +- .../pentaho/di/trans/steps/pmi/PMIDecisionTreeClassifier.java | 2 +- .../pentaho/di/trans/steps/pmi/PMIDecisionTreeRegressor.java | 2 +- .../org/pentaho/di/trans/steps/pmi/PMIDeepLearningNetwork.java | 2 +- .../org/pentaho/di/trans/steps/pmi/PMIGradientBoostedTrees.java | 2 +- .../org/pentaho/di/trans/steps/pmi/PMILinearRegression.java | 2 +- .../org/pentaho/di/trans/steps/pmi/PMILogisticRegression.java | 2 +- .../di/trans/steps/pmi/PMIMultiLayerPerceptronClassifier.java | 2 +- .../di/trans/steps/pmi/PMIMultiLayerPerceptronRegressor.java | 2 +- src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayes.java | 2 +- .../pentaho/di/trans/steps/pmi/PMINaiveBayesIncremental.java | 2 +- .../pentaho/di/trans/steps/pmi/PMINaiveBayesMultinomial.java | 2 +- .../pentaho/di/trans/steps/pmi/PMIRandomForestClassifier.java | 2 +- .../pentaho/di/trans/steps/pmi/PMIRandomForestRegressor.java | 2 +- .../java/org/pentaho/di/trans/steps/pmi/PMISVMClassifier.java | 2 +- .../java/org/pentaho/di/trans/steps/pmi/PMISVMRegressor.java | 2 +- .../java/org/pentaho/di/trans/steps/pmi/PMIScoringMeta.java | 2 +- .../org/pentaho/di/trans/steps/pmi/SupervisedEvaluatorMeta.java | 2 +- .../pentaho/di/trans/steps/pmi/weka/PMIFlowExecutorMeta.java | 2 +- .../org/pentaho/di/trans/steps/pmi/weka/PMIForecastingMeta.java | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 0f1999f..a7b846f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.pentaho plugin-machine-intelligence - 1.4 + 1.5 Plugin Machine Intelligence for PDI diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeClassifier.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeClassifier.java index 4e869fd..69a0133 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeClassifier.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeClassifier.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIDecisionTreeClassifier", image = "WEKAS.svg", name = "PMI Decision Tree Classifier", description = "Train and evaluate a decision tree for classification model", categoryDescription = "Data Mining" ) +@Step( id = "PMIDecisionTreeClassifier", image = "WEKAS.svg", name = "PMI Decision Tree Classifier", description = "Train and evaluate a decision tree for classification model", categoryDescription = "PMI" ) public class PMIDecisionTreeClassifier extends BaseSupervisedPMIStepMeta { public PMIDecisionTreeClassifier() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeRegressor.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeRegressor.java index fce7fcf..1911765 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeRegressor.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDecisionTreeRegressor.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIDecisionTreeRegressor", image = "WEKAS.svg", name = "PMI Decision Tree Regressor", description = "Train and evaluate a decision tree for regression model", categoryDescription = "Data Mining" ) +@Step( id = "PMIDecisionTreeRegressor", image = "WEKAS.svg", name = "PMI Decision Tree Regressor", description = "Train and evaluate a decision tree for regression model", categoryDescription = "PMI" ) public class PMIDecisionTreeRegressor extends BaseSupervisedPMIStepMeta { public PMIDecisionTreeRegressor() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDeepLearningNetwork.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDeepLearningNetwork.java index 8ac3b89..ca010b6 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDeepLearningNetwork.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIDeepLearningNetwork.java @@ -6,7 +6,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIDeepLearningNetwork", image = "WEKAS.svg", name = "PMI Deep learning network", description = "Train and evaluate a deep learning network model", categoryDescription = "Data Mining" ) +@Step( id = "PMIDeepLearningNetwork", image = "WEKAS.svg", name = "PMI Deep learning network", description = "Train and evaluate a deep learning network model", categoryDescription = "PMI" ) public class PMIDeepLearningNetwork extends BaseSupervisedPMIStepMeta { public PMIDeepLearningNetwork() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIGradientBoostedTrees.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIGradientBoostedTrees.java index d0ad548..675bc3a 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIGradientBoostedTrees.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIGradientBoostedTrees.java @@ -30,7 +30,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIGradientBoostedTrees", image = "WEKAS.svg", name = "PMI Gradient Boosted Trees", description = "Train and evaluate a gradient boosted trees model", categoryDescription = "Data Mining") +@Step( id = "PMIGradientBoostedTrees", image = "WEKAS.svg", name = "PMI Gradient Boosted Trees", description = "Train and evaluate a gradient boosted trees model", categoryDescription = "PMI") public class PMIGradientBoostedTrees extends BaseSupervisedPMIStepMeta { public PMIGradientBoostedTrees() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMILinearRegression.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMILinearRegression.java index b9727b7..56930a0 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMILinearRegression.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMILinearRegression.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMILinearRegression", image = "WEKAS.svg", name = "PMI Linear Regression", description = "Train and evaluate a linear regression model", categoryDescription = "Data Mining" ) +@Step( id = "PMILinearRegression", image = "WEKAS.svg", name = "PMI Linear Regression", description = "Train and evaluate a linear regression model", categoryDescription = "PMI" ) public class PMILinearRegression extends BaseSupervisedPMIStepMeta { public PMILinearRegression() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMILogisticRegression.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMILogisticRegression.java index c72dea8..686bb66 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMILogisticRegression.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMILogisticRegression.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMILogisticRegression", image = "WEKAS.svg", name = "PMI Logistic Regression", description = "Train and evaluate a logistic regression model", categoryDescription = "Data Mining" ) +@Step( id = "PMILogisticRegression", image = "WEKAS.svg", name = "PMI Logistic Regression", description = "Train and evaluate a logistic regression model", categoryDescription = "PMI" ) public class PMILogisticRegression extends BaseSupervisedPMIStepMeta { public PMILogisticRegression() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronClassifier.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronClassifier.java index 7a5c63a..ee6704d 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronClassifier.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronClassifier.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIMultiLayerPerceptronClassifier", image = "WEKAS.svg", name = "PMI Multi-layer Perceptron Classifier", description = "Train and evaluate a multi-layer perceptron classification model", categoryDescription = "Data Mining" ) +@Step( id = "PMIMultiLayerPerceptronClassifier", image = "WEKAS.svg", name = "PMI Multi-layer Perceptron Classifier", description = "Train and evaluate a multi-layer perceptron classification model", categoryDescription = "PMI" ) public class PMIMultiLayerPerceptronClassifier extends BaseSupervisedPMIStepMeta { public PMIMultiLayerPerceptronClassifier() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronRegressor.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronRegressor.java index a26403d..40bd618 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronRegressor.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIMultiLayerPerceptronRegressor.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIMultiLayerPerceptronRegressor", image = "WEKAS.svg", name = "PMI Multi-layer Perceptron Regressor", description = "Train and evaluate a multi-layer perceptron regression model", categoryDescription = "Data Mining" ) +@Step( id = "PMIMultiLayerPerceptronRegressor", image = "WEKAS.svg", name = "PMI Multi-layer Perceptron Regressor", description = "Train and evaluate a multi-layer perceptron regression model", categoryDescription = "PMI" ) public class PMIMultiLayerPerceptronRegressor extends BaseSupervisedPMIStepMeta { public PMIMultiLayerPerceptronRegressor() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayes.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayes.java index 40b58ce..8340151 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayes.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayes.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMINaiveBayes", image = "WEKAS.svg", name = "PMI Naive Bayes", description = "Train and evaluate a naive Bayes model", categoryDescription = "Data Mining") +@Step( id = "PMINaiveBayes", image = "WEKAS.svg", name = "PMI Naive Bayes", description = "Train and evaluate a naive Bayes model", categoryDescription = "PMI") public class PMINaiveBayes extends BaseSupervisedPMIStepMeta { public PMINaiveBayes() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesIncremental.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesIncremental.java index 245d8b6..8eba74f 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesIncremental.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesIncremental.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMINaiveBayesIncremental", image = "WEKAS.svg", name = "PMI Naive Bayes incremental", description = "Train and evaluate an incremental naive Bayes classifier", categoryDescription = "Data Mining" ) +@Step( id = "PMINaiveBayesIncremental", image = "WEKAS.svg", name = "PMI Naive Bayes incremental", description = "Train and evaluate an incremental naive Bayes classifier", categoryDescription = "PMI" ) public class PMINaiveBayesIncremental extends BaseSupervisedPMIStepMeta { public PMINaiveBayesIncremental() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesMultinomial.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesMultinomial.java index 0e51d76..1d865ca 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesMultinomial.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMINaiveBayesMultinomial.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMINaiveBayesMultinomial", image = "WEKAS.svg", name = "PMI Naive Bayes Multinomial", description = "Train and evaluate a multinomial naive Bayes model", categoryDescription = "Data Mining") +@Step( id = "PMINaiveBayesMultinomial", image = "WEKAS.svg", name = "PMI Naive Bayes Multinomial", description = "Train and evaluate a multinomial naive Bayes model", categoryDescription = "PMI") public class PMINaiveBayesMultinomial extends BaseSupervisedPMIStepMeta { public PMINaiveBayesMultinomial() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestClassifier.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestClassifier.java index 09e50f2..578b7fb 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestClassifier.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestClassifier.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIRandomForestClassifier", image = "WEKAS.svg", name = "PMI Random Forest Classifier", description = "Train and evaluate a random forest classification model", categoryDescription = "Data Mining") +@Step( id = "PMIRandomForestClassifier", image = "WEKAS.svg", name = "PMI Random Forest Classifier", description = "Train and evaluate a random forest classification model", categoryDescription = "PMI") public class PMIRandomForestClassifier extends BaseSupervisedPMIStepMeta { public PMIRandomForestClassifier() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestRegressor.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestRegressor.java index cb43c9b..e8f9fc1 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestRegressor.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIRandomForestRegressor.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIRandomForestRegressor", image = "WEKAS.svg", name = "PMI Random Forest Regressor", description = "Train and evaluate a random forest regression model", categoryDescription = "Data Mining" ) +@Step( id = "PMIRandomForestRegressor", image = "WEKAS.svg", name = "PMI Random Forest Regressor", description = "Train and evaluate a random forest regression model", categoryDescription = "PMI" ) public class PMIRandomForestRegressor extends BaseSupervisedPMIStepMeta { public PMIRandomForestRegressor() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMClassifier.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMClassifier.java index 3c91aa7..91f52fc 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMClassifier.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMClassifier.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMISVMClassifier", image = "WEKAS.svg", name = "PMI Support Vector Classifier", description = "Train and evaluate a support vector classification model", categoryDescription = "Data Mining") +@Step( id = "PMISVMClassifier", image = "WEKAS.svg", name = "PMI Support Vector Classifier", description = "Train and evaluate a support vector classification model", categoryDescription = "PMI") public class PMISVMClassifier extends BaseSupervisedPMIStepMeta { public PMISVMClassifier() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMRegressor.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMRegressor.java index ab69df5..0e9146f 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMRegressor.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMISVMRegressor.java @@ -28,7 +28,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMISVMRegressor", image = "WEKAS.svg", name = "PMI Support Vector Regressor", description = "Train and evaluate a support vector regressor model", categoryDescription = "Data Mining") +@Step( id = "PMISVMRegressor", image = "WEKAS.svg", name = "PMI Support Vector Regressor", description = "Train and evaluate a support vector regressor model", categoryDescription = "PMI") public class PMISVMRegressor extends BaseSupervisedPMIStepMeta { public PMISVMRegressor() { diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIScoringMeta.java b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIScoringMeta.java index 331af78..e445237 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/PMIScoringMeta.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/PMIScoringMeta.java @@ -65,7 +65,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "PMIScoring", image = "WEKAS.svg", name = "PMI Scoring", description = "Score or evaluate a PMI model", categoryDescription = "Data Mining" ) +@Step( id = "PMIScoring", image = "WEKAS.svg", name = "PMI Scoring", description = "Score or evaluate a PMI model", categoryDescription = "PMI" ) public class PMIScoringMeta extends BaseStepMeta implements StepMetaInterface { public static Class PKG = PMIScoringMeta.class; diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/SupervisedEvaluatorMeta.java b/src/main/java/org/pentaho/di/trans/steps/pmi/SupervisedEvaluatorMeta.java index f9b4283..4570c60 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/SupervisedEvaluatorMeta.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/SupervisedEvaluatorMeta.java @@ -61,7 +61,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision: $ */ -@Step( id = "SupervisedEvaluator", image = "WEKAS.svg", name = "Supervised Evaluator", description = "Compute supervised evaluation metrics for incoming row data that contains predictions from a learning scheme", categoryDescription = "Data Mining" ) +@Step( id = "SupervisedEvaluator", image = "WEKAS.svg", name = "Supervised Evaluator", description = "Compute supervised evaluation metrics for incoming row data that contains predictions from a learning scheme", categoryDescription = "PMI" ) public class SupervisedEvaluatorMeta extends BaseStepMeta implements StepMetaInterface { protected String m_className = ""; diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIFlowExecutorMeta.java b/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIFlowExecutorMeta.java index e4f729e..dd2b0f5 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIFlowExecutorMeta.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIFlowExecutorMeta.java @@ -66,7 +66,7 @@ */ @Step( id = "PMIFlowExecutor", image = "WEKAS.svg", name = "PMI Flow Executor", description = "Executes a WEKA Knowledge Flow data " - + "mining process", documentationUrl = "http://wiki.pentaho.com/display/EAI/Knowledge+Flow", categoryDescription = "Data Mining" ) + + "mining process", documentationUrl = "http://wiki.pentaho.com/display/EAI/Knowledge+Flow", categoryDescription = "PMI" ) public class PMIFlowExecutorMeta extends BaseStepMeta implements StepMetaInterface { public static Class PKG = PMIFlowExecutorMeta.class; diff --git a/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIForecastingMeta.java b/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIForecastingMeta.java index 1e4b187..91a034c 100644 --- a/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIForecastingMeta.java +++ b/src/main/java/org/pentaho/di/trans/steps/pmi/weka/PMIForecastingMeta.java @@ -68,7 +68,7 @@ * @author Mark Hall (mhall{[at]}pentaho{[dot]}com) * @version $Revision$ */ -@Step( id = "PMIForecasting", image = "WEKAS.svg", documentationUrl = "http://wiki.pentaho.com/display/EAI/Weka+Forecasting", name = "PMI Forecasting", description = "This step makes time series forecasts from a pre-built WEKA forecasting model", categoryDescription = "Data Mining" ) +@Step( id = "PMIForecasting", image = "WEKAS.svg", documentationUrl = "http://wiki.pentaho.com/display/EAI/Weka+Forecasting", name = "PMI Forecasting", description = "This step makes time series forecasts from a pre-built WEKA forecasting model", categoryDescription = "PMI" ) public class PMIForecastingMeta extends BaseStepMeta implements StepMetaInterface { public static Class PKG = PMIForecastingMeta.class;