Changeset 1748 for branches

Timestamp:

09/16/14 18:19:36 (10 years ago)

Author:

rkrimmel

Message:

Cleaning up substitution matrix

Location:

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix

Files:

• DifferenceSubstitutionMatrix.java (deleted)
• DummySubstitutionMatrix.java (deleted)
• NearbySubstitutionMatrix.java (deleted)
• ObjectDistanceSubstitionMatrix.java (modified) (3 diffs)
• PreallocatedDynamicTriangleMatrix.java (modified) (1 diff)
• SubstitutionMatrix.java (modified) (2 diffs)

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java

@@ -5 +5 @@
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37 +38 @@
         
         /** The unique tasks. */
-        private HashSet<ITask> uniqueTasks;
+        private Collection<ITask> uniqueTasks;
         
         /** The gap penalty. */
@@ -209 +210 @@
          */
         @Override
-        public void generate(HashSet<ITask> uniqueTasks) {
+        public void generate(Collection<ITask> uniqueTasks) {
                 this.uniqueTasks = uniqueTasks;
                 if (this.calculateNonEventTaskInstances) {

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/PreallocatedDynamicTriangleMatrix.java

@@ -54 +54 @@
             this.size += count;
             if(size>actualsize) {
-                int newElements = ((oldsize * count) + ((count * (count + 1)) / 2));
+                //int newElements = ((oldsize * count) + ((count * (count + 1)) / 2));
                 actualsize*=2;
                 float[] newmatrix = new float[actualsize];

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/SubstitutionMatrix.java

@@ -4 +4 @@
 package de.ugoe.cs.autoquest.tasktrees.alignment.matrix;
 
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.LinkedList;
 
@@ -20 +20 @@
          * @param uniqueTasks the unique tasks
          */
-        public void generate(HashSet<ITask> uniqueTasks);
+        public void generate(Collection<ITask> uniqueTasks);
 
         /**