#434 - renamed classes

dkpro · Feb 5, 2018 · f05aa08 · f05aa08
1 parent 045b5fa
commit f05aa08
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/...io/libsvm/LibsvmModelLoaderConnector.java → ...m/LibsvmDataFormatLoadModelConnector.java b/...io/libsvm/LibsvmModelLoaderConnector.java → ...m/LibsvmDataFormatLoadModelConnector.java
@@ -47,7 +47,7 @@
 import org.dkpro.tc.core.util.TaskUtils;
 import org.dkpro.tc.ml.uima.TcAnnotator;
 
-public abstract class LibsvmModelLoaderConnector
+public abstract class LibsvmDataFormatLoadModelConnector
     extends ModelSerialization_ImplBase
 {
 
@@ -65,8 +65,6 @@ public abstract class LibsvmModelLoaderConnector
     @ConfigurationParameter(name = PARAM_LEARNING_MODE, mandatory = true)
     protected String learningMode;
 
-//    private svm_model model;
-
     protected Map<String, String> integer2OutcomeMapping;
     protected Map<String, Integer> featureMapping;
 
@@ -77,8 +75,6 @@ public void initialize(UimaContext context)
         super.initialize(context);
 
         try {
-//            model = svm
-//                    .svm_load_model(new File(tcModelLocation, MODEL_CLASSIFIER).getAbsolutePath());
             integer2OutcomeMapping = loadInteger2OutcomeMapping(tcModelLocation);
             featureMapping = loadFeature2IntegerMapping(tcModelLocation);
             SaveModelUtils.verifyTcVersion(tcModelLocation, getClass());

diff --git a/...c/io/libsvm/LibsvmModelSerialization.java → ...svmDataFormatSerializeModelConnector.java b/...c/io/libsvm/LibsvmModelSerialization.java → ...svmDataFormatSerializeModelConnector.java
@@ -30,7 +30,7 @@
 import org.dkpro.tc.core.Constants;
 import org.dkpro.tc.core.task.ModelSerializationTask;
 
-public abstract class LibsvmModelSerialization extends ModelSerializationTask implements Constants {
+public abstract class LibsvmDataFormatSerializeModelConnector extends ModelSerializationTask implements Constants {
 
 	@Discriminator(name = DIM_CLASSIFICATION_ARGS)
 	protected List<String> classificationArguments;

diff --git a/.../java/org/dkpro/tc/ml/liblinear/serialization/LiblinearModelSerializationDescription.java b/.../java/org/dkpro/tc/ml/liblinear/serialization/LiblinearModelSerializationDescription.java
@@ -22,7 +22,7 @@
 
 import org.dkpro.tc.core.Constants;
 import org.dkpro.tc.core.util.SaveModelUtils;
-import org.dkpro.tc.io.libsvm.LibsvmModelSerialization;
+import org.dkpro.tc.io.libsvm.LibsvmDataFormatSerializeModelConnector;
 import org.dkpro.tc.ml.liblinear.LiblinearAdapter;
 import org.dkpro.tc.ml.liblinear.util.LiblinearUtils;
 
@@ -32,7 +32,7 @@
 import de.bwaldvogel.liblinear.Problem;
 import de.bwaldvogel.liblinear.SolverType;
 
-public class LiblinearModelSerializationDescription extends LibsvmModelSerialization implements Constants {
+public class LiblinearModelSerializationDescription extends LibsvmDataFormatSerializeModelConnector implements Constants {
 
 	boolean trainModel = true;
 

diff --git a/...ar/src/main/java/org/dkpro/tc/ml/liblinear/serialization/LoadModelConnectorLiblinear.java b/...ar/src/main/java/org/dkpro/tc/ml/liblinear/serialization/LoadModelConnectorLiblinear.java
@@ -27,14 +27,14 @@
 
 import org.apache.uima.UimaContext;
 import org.apache.uima.resource.ResourceInitializationException;
-import org.dkpro.tc.io.libsvm.LibsvmModelLoaderConnector;
+import org.dkpro.tc.io.libsvm.LibsvmDataFormatLoadModelConnector;
 
 import de.bwaldvogel.liblinear.Feature;
 import de.bwaldvogel.liblinear.Linear;
 import de.bwaldvogel.liblinear.Model;
 import de.bwaldvogel.liblinear.Problem;
 
-public class LoadModelConnectorLiblinear extends LibsvmModelLoaderConnector {
+public class LoadModelConnectorLiblinear extends LibsvmDataFormatLoadModelConnector {
 
 	private Model liblinearModel;
 

diff --git a/...c/main/java/org/dkpro/tc/ml/libsvm/serialization/LibsvmModelSerializationDescription.java b/...c/main/java/org/dkpro/tc/ml/libsvm/serialization/LibsvmModelSerializationDescription.java
@@ -24,11 +24,11 @@
 
 import org.dkpro.tc.core.Constants;
 import org.dkpro.tc.core.util.SaveModelUtils;
-import org.dkpro.tc.io.libsvm.LibsvmModelSerialization;
+import org.dkpro.tc.io.libsvm.LibsvmDataFormatSerializeModelConnector;
 import org.dkpro.tc.ml.libsvm.LibsvmAdapter;
 import org.dkpro.tc.ml.libsvm.api.LibsvmTrainModel;
 
-public class LibsvmModelSerializationDescription extends LibsvmModelSerialization implements Constants {
+public class LibsvmModelSerializationDescription extends LibsvmDataFormatSerializeModelConnector implements Constants {
 
 	@Override
 	protected void trainModel(File fileTrain) throws Exception {

diff --git a/...l-libsvm/src/main/java/org/dkpro/tc/ml/libsvm/serialization/LoadModelConnectorLibsvm.java b/...l-libsvm/src/main/java/org/dkpro/tc/ml/libsvm/serialization/LoadModelConnectorLibsvm.java
@@ -30,13 +30,13 @@
 import org.apache.uima.UimaContext;
 import org.apache.uima.pear.util.FileUtil;
 import org.apache.uima.resource.ResourceInitializationException;
-import org.dkpro.tc.io.libsvm.LibsvmModelLoaderConnector;
+import org.dkpro.tc.io.libsvm.LibsvmDataFormatLoadModelConnector;
 import org.dkpro.tc.ml.libsvm.api.LibsvmPredict;
 
 import libsvm.svm;
 import libsvm.svm_model;
 
-public class LoadModelConnectorLibsvm extends LibsvmModelLoaderConnector {
+public class LoadModelConnectorLibsvm extends LibsvmDataFormatLoadModelConnector {
 
 	private svm_model model;