Adding version 1.0

DSC-SPIDAL · Jan 9, 2016 · 4df0bb0 · 4df0bb0
1 parent 0beb58b
commit 4df0bb0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/edu/indiana/soic/spidal/damds/Program.java b/src/main/java/edu/indiana/soic/spidal/damds/Program.java
@@ -1430,8 +1430,8 @@ private static void readDistancesAndWeights(boolean isSammon) {
                 true, function, config.repetitions, distances);
         }
 
-        short[] w = null;
         if (!Strings.isNullOrEmpty(config.weightMatrixFile)){
+            short[] w = null;
             function = !Strings.isNullOrEmpty(config.weightTransformationFunction)
                 ? loadFunction(config.weightTransformationFunction)
                 : null;
@@ -1454,6 +1454,9 @@ private static void readDistancesAndWeights(boolean isSammon) {
                 sw = BinaryReader2D.readSimpleFile(config.weightMatrixFile, config.numberDataPoints);
                 weights = new WeightsWrap1D(sw, ParallelOps.procRowRange, distances, isSammon, ParallelOps.globalColCount, function);
             }
+        } else {
+            weights = new WeightsWrap1D(
+                null, distances, isSammon, ParallelOps.globalColCount);
         }
 
     }