Changeset 74

Timestamp:

05/04/16 11:55:23 (9 years ago)

Author:

sherbold

Message:

• fixed some minor problems found by FindBugs?

Location:

trunk/CrossPare/src/de/ugoe/cs/cpdp

Files:

• Runner.java (modified) (1 diff)
• dataselection/MahalanobisOutlierRemoval.java (modified) (1 diff)
• loader/AbstractFolderLoader.java (modified) (1 diff)
• loader/DecentDataLoader.java (modified) (3 diffs)
• loader/DecentFolderLoader.java (modified) (1 diff)
• training/WekaLASERTraining.java (modified) (2 diffs)
• training/WekaLocalFQTraining.java (modified) (1 diff)
• training/WekaTraining.java (modified) (1 diff)

trunk/CrossPare/src/de/ugoe/cs/cpdp/Runner.java

@@ -52 +52 @@
                 createConfig(threadPool, file.getAbsolutePath());
             }
-            else if (file.isDirectory()) {
+            else if (file.isDirectory() && file.listFiles()!=null ) {
                 for (File subfile : file.listFiles()) {
                     if (subfile.isFile()) {

trunk/CrossPare/src/de/ugoe/cs/cpdp/dataselection/MahalanobisOutlierRemoval.java

@@ -48 +48 @@
     @Override
     public void setParameter(String parameters) {
-        if (parameters != null && parameters != "") {
+        if (parameters != null && parameters.isEmpty()) {
             epsilon = Double.parseDouble(parameters);
         }

trunk/CrossPare/src/de/ugoe/cs/cpdp/loader/AbstractFolderLoader.java

@@ -53 +53 @@
         final File dataDir = new File(path);
         final SingleVersionLoader instancesLoader = getSingleLoader();
-
+        if (dataDir.listFiles() == null) {
+            return versions;
+        }
         for (File projectDir : dataDir.listFiles()) {
             if (projectDir.isDirectory()) {
                 String projectName = projectDir.getName();
-                for (File versionFile : projectDir.listFiles()) {
-                    if (versionFile.isFile() &&
-                        instancesLoader.filenameFilter(versionFile.getName()))
-                    {
-                        String versionName = versionFile.getName();
-                        Instances data = instancesLoader.load(versionFile);
-                        versions.add(new SoftwareVersion(projectName, versionName, data));
+                if (projectDir.listFiles() != null) {
+                    for (File versionFile : projectDir.listFiles()) {
+                        if (versionFile.isFile() &&
+                            instancesLoader.filenameFilter(versionFile.getName()))
+                        {
+                            String versionName = versionFile.getName();
+                            Instances data = instancesLoader.load(versionFile);
+                            versions.add(new SoftwareVersion(projectName, versionName, data));
+                        }
                     }
                 }

trunk/CrossPare/src/de/ugoe/cs/cpdp/loader/DecentDataLoader.java

@@ -163 +163 @@
             catch (FileNotFoundException e) {
                 Console.printerrln("File with path: " + arffLocation + " was not found.");
-                e.printStackTrace();
+                throw new RuntimeException(e);
             }
             catch (IOException e) {
                 Console.printerrln("File with path: " + arffLocation + " cannot be read.");
-                e.printStackTrace();
+                throw new RuntimeException(e);
             }
 
@@ -445 +445 @@
         }
         else {
-
+            Console.printerrln("Could not determine model type, file should end with either .etl or .eol");
+            return null;
         }
 
@@ -453 +454 @@
             Console.printerrln("Parse error occured...");
             for (ParseProblem problem : module.getParseProblems()) {
-                System.err.println(problem.toString());
+                Console.printerrln(problem.toString());
             }
             // System.exit(-1);

trunk/CrossPare/src/de/ugoe/cs/cpdp/loader/DecentFolderLoader.java

@@ -64 +64 @@
          * and searches for "model.decent" files.
          */
+        if (dataDir.listFiles() == null) {
+            return versions;
+        }
         for (File projectDir : dataDir.listFiles()) {
             if (projectDir.isDirectory()) {
                 projectName = projectDir.getName();
-                for (File versionFile : projectDir.listFiles()) {
-                    loadDataFromFile(versionFile, instancesLoader, projectName, versions);
+                if (projectDir.listFiles() != null) {
+                    for (File versionFile : projectDir.listFiles()) {
+                        loadDataFromFile(versionFile, instancesLoader, projectName, versions);
+                    }
                 }
             }

trunk/CrossPare/src/de/ugoe/cs/cpdp/training/WekaLASERTraining.java

@@ -110 +110 @@
                     boolean allEqual = true;
                     for( Integer index : closestToTrainingInstance ) {
-                        if( label == Double.NaN ) {
+                        if( Double.isNaN(label) ) {
                             label = traindata.get(closestToTrainingInstance.get(index)).classValue();
                         }
@@ -129 +129 @@
                 boolean allEqual = true;
                 for( Integer index : closestInstances ) {
-                    if( label == Double.NaN ) {
+                    if( Double.isNaN(label) ) {
                         label = traindata.get(closestInstances.get(index)).classValue();
                     }

trunk/CrossPare/src/de/ugoe/cs/cpdp/training/WekaLocalFQTraining.java

@@ -399 +399 @@
 
             double[][] X = FMAP.getX();
-            distmat = new double[0][0];
-            System.gc();
 
             // quadtree payload generation

trunk/CrossPare/src/de/ugoe/cs/cpdp/training/WekaTraining.java

@@ -48 +48 @@
     public void apply(Instances traindata) {
         classifier = setupClassifier();
+        if( classifier==null ) {
+            Console.printerr("classifier of WekaTraining is null");
+            throw new RuntimeException("classifier of WekaTraining is null");
+        }
         PrintStream errStr = System.err;
         System.setErr(new PrintStream(new NullOutputStream()));