Commit 8da4376c authored by lafabregue's avatar lafabregue

Merge branch 'jclFix'

parents f8c22cfc 0a2d9516
...@@ -441,7 +441,7 @@ public class SimpleData extends Data { ...@@ -441,7 +441,7 @@ public class SimpleData extends Data {
return data; return data;
} }
private List<DataObject> getDataObjects(final Mask mask) { public List<DataObject> getDataObjects(final Mask mask) {
if (mask.getOverallCarinality() < getNbObjects()) { if (mask.getOverallCarinality() < getNbObjects()) {
throw new IndexOutOfBoundsException("The nnumber of unmasked pixels" throw new IndexOutOfBoundsException("The nnumber of unmasked pixels"
+ " is lower than the expeted sample size"); + " is lower than the expeted sample size");
......
...@@ -133,4 +133,18 @@ public class FilterEntropy extends Filter { ...@@ -133,4 +133,18 @@ public class FilterEntropy extends Filter {
return rank; return rank;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -75,4 +75,18 @@ public class FilterNormalization extends Filter { ...@@ -75,4 +75,18 @@ public class FilterNormalization extends Filter {
} }
return (sumDist / nbDist); return (sumDist / nbDist);
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
This diff is collapsed.
...@@ -7,6 +7,7 @@ import java.util.List; ...@@ -7,6 +7,7 @@ import java.util.List;
import jcl.data.DataObject; import jcl.data.DataObject;
import jcl.data.mask.Mask; import jcl.data.mask.Mask;
import jcl.utils.MemoryFlush; import jcl.utils.MemoryFlush;
import jcl.utils.Progressable;
/** /**
* <p> * <p>
...@@ -15,7 +16,7 @@ import jcl.utils.MemoryFlush; ...@@ -15,7 +16,7 @@ import jcl.utils.MemoryFlush;
* *
* @author Baptiste LAFABREGUE * @author Baptiste LAFABREGUE
*/ */
public abstract class Sampler implements MemoryFlush, Cloneable, Serializable { public abstract class Sampler implements MemoryFlush, Cloneable, Serializable, Progressable {
/** */ /** */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -826,4 +826,18 @@ public class ARFFReader extends DataFileReader { ...@@ -826,4 +826,18 @@ public class ARFFReader extends DataFileReader {
} }
return res; return res;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} // fin class :) } // fin class :)
...@@ -209,4 +209,18 @@ public class ARFFWriter extends DataFileWriter { ...@@ -209,4 +209,18 @@ public class ARFFWriter extends DataFileWriter {
} }
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -571,4 +571,18 @@ public class XmlResultReader extends DataFileReader { ...@@ -571,4 +571,18 @@ public class XmlResultReader extends DataFileReader {
} }
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -325,4 +325,18 @@ public class XmlResultWriter extends DataFileWriter { ...@@ -325,4 +325,18 @@ public class XmlResultWriter extends DataFileWriter {
this.saveFile(this.file.getAbsolutePath()); this.saveFile(this.file.getAbsolutePath());
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -308,6 +308,20 @@ public class RoiReader extends DataFileIO { ...@@ -308,6 +308,20 @@ public class RoiReader extends DataFileIO {
return empty; return empty;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
/* /*
* public static void main (String args []) { if (args.length == 1) try { * public static void main (String args []) { if (args.length == 1) try {
* RoiReader roiReader = new RoiReader(args [0]); Data [] roi = * RoiReader roiReader = new RoiReader(args [0]); Data [] roi =
......
...@@ -165,4 +165,18 @@ public class ClassifierUnified extends LearningMethod implements Cloneable { ...@@ -165,4 +165,18 @@ public class ClassifierUnified extends LearningMethod implements Cloneable {
"Method split() not yet implemented."); "Method split() not yet implemented.");
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -114,4 +114,18 @@ public class ClassifierAHC extends LearningMethod { ...@@ -114,4 +114,18 @@ public class ClassifierAHC extends LearningMethod {
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -707,4 +707,18 @@ public class ClassifierCobweb extends LearningMethod implements Cloneable, ...@@ -707,4 +707,18 @@ public class ClassifierCobweb extends LearningMethod implements Cloneable,
public int getType() { public int getType() {
return ClassifierUtils.COBWEB; return ClassifierUtils.COBWEB;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -74,4 +74,18 @@ public class ClassifierCure extends LearningMethod { ...@@ -74,4 +74,18 @@ public class ClassifierCure extends LearningMethod {
final int n) throws MethodNotImplementedException { final int n) throws MethodNotImplementedException {
throw new MethodNotImplementedException(); throw new MethodNotImplementedException();
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -105,4 +105,18 @@ public class ClassifierEM extends LearningMethod implements Serializable { ...@@ -105,4 +105,18 @@ public class ClassifierEM extends LearningMethod implements Serializable {
final int n) throws MethodNotImplementedException { final int n) throws MethodNotImplementedException {
throw new MethodNotImplementedException(); throw new MethodNotImplementedException();
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -145,4 +145,18 @@ public class ClassifierEvidence extends LearningMethod implements Serializable { ...@@ -145,4 +145,18 @@ public class ClassifierEvidence extends LearningMethod implements Serializable {
return str; return str;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -629,4 +629,18 @@ public class ClassifierGNG extends LearningMethod { ...@@ -629,4 +629,18 @@ public class ClassifierGNG extends LearningMethod {
return wn; return wn;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -457,4 +457,18 @@ public class ClassifierKmeans extends LearningMethod { ...@@ -457,4 +457,18 @@ public class ClassifierKmeans extends LearningMethod {
return result; return result;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -102,4 +102,18 @@ public class ConstraintKmeans extends LearningMethod { ...@@ -102,4 +102,18 @@ public class ConstraintKmeans extends LearningMethod {
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -94,4 +94,18 @@ public class LocalKmeans extends LearningMethod { ...@@ -94,4 +94,18 @@ public class LocalKmeans extends LearningMethod {
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -94,4 +94,18 @@ public class HiddenKmeans extends LearningMethod { ...@@ -94,4 +94,18 @@ public class HiddenKmeans extends LearningMethod {
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -233,4 +233,18 @@ public class ClassifierKmeansGenetic extends LearningMethod { ...@@ -233,4 +233,18 @@ public class ClassifierKmeansGenetic extends LearningMethod {
} }
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -219,4 +219,18 @@ public class ClassifierOTBKmeans extends LearningMethod{ ...@@ -219,4 +219,18 @@ public class ClassifierOTBKmeans extends LearningMethod{
} }
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -95,4 +95,18 @@ public class SeededKmeans extends LearningMethod { ...@@ -95,4 +95,18 @@ public class SeededKmeans extends LearningMethod {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -188,4 +188,18 @@ public class ClassifierKmedoids extends LearningMethod { ...@@ -188,4 +188,18 @@ public class ClassifierKmedoids extends LearningMethod {
} }
return null; return null;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -134,4 +134,19 @@ public class ClassifierPerceptron extends LearningMethod { ...@@ -134,4 +134,19 @@ public class ClassifierPerceptron extends LearningMethod {
final int n) throws MethodNotImplementedException { final int n) throws MethodNotImplementedException {
throw new MethodNotImplementedException(); throw new MethodNotImplementedException();
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
return null;
// TODO Auto-generated method stub
}
} }
...@@ -140,4 +140,18 @@ public class ClassifierRandom extends LearningMethod implements Serializable { ...@@ -140,4 +140,18 @@ public class ClassifierRandom extends LearningMethod implements Serializable {
return str; return str;
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -142,4 +142,18 @@ public class ClassifierSOM extends LearningMethod implements Serializable { ...@@ -142,4 +142,18 @@ public class ClassifierSOM extends LearningMethod implements Serializable {
final int n) throws MethodNotImplementedException { final int n) throws MethodNotImplementedException {
throw new MethodNotImplementedException(); throw new MethodNotImplementedException();
} }
@Override
public void setStatus(String status)
{
// TODO Auto-generated method stub
}
@Override
public String getStatus()
{
// TODO Auto-generated method stub
return null;
}
} }
...@@ -220,4 +220,18 @@ public class WrapperFeatureRanking extends Wrapper { ...@@ -220,4 +220,18 @@ public class WrapperFeatureRanking extends Wrapper {
public String toString() { public String toString() {
return this.parameters.getLearningMethodName(); return this.parameters.getLearningMethodName();
} }
@Override
public void setStatus(String status)