Changeset 1702 for branches/autoquest-core-tasktrees-alignment/src/main

Timestamp:

09/01/14 15:34:03 (10 years ago)

Author:

rkrimmel

Message:

 

Location:

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

Files:

• alignment/matrix/DifferenceSubstitutionMatrix.java (modified) (2 diffs)
• alignment/matrix/DummySubstitutionMatrix.java (modified) (2 diffs)
• alignment/matrix/DynamicTriangleMatrix.java (added)
• alignment/matrix/ITriangleMatrix.java (added)
• alignment/matrix/NearbySubstitutionMatrix.java (modified) (2 diffs)
• alignment/matrix/ObjectDistanceSubstitionMatrix.java (modified) (6 diffs)
• alignment/matrix/SubstitutionMatrix.java (modified) (1 diff)
• alignment/matrix/UPGMAMatrix.java (modified) (1 diff)
• temporalrelation/RuleUtils.java (modified) (6 diffs)
• temporalrelation/SequenceForTaskDetectionRuleAlignment.java (modified) (4 diffs)

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

@@ -29 +29 @@
          * @see de.ugoe.cs.autoquest.plugin.alignment.SubstitutionMatrix#getDistance(int, int)
          */
-        public double getScore(int pos1, int pos2) {
+        public float getScore(int pos1, int pos2) {
                 return maxValue - (input1[pos1] - input2[pos2]);
         }
@@ -49 +49 @@
 
         @Override
-        public double getGapPenalty() {
+        public float getGapPenalty() {
                 return -maxValue;
         }

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

@@ -9 +9 @@
 
         @Override
-        public double getScore(int pos1, int pos2) {
+        public float getScore(int pos1, int pos2) {
                 if(pos1==pos2) {
                         return 1;
@@ -19 +19 @@
 
         @Override
-        public double getGapPenalty() {
+        public float getGapPenalty() {
                 return -1;
         }

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

@@ -28 +28 @@
          * @see de.ugoe.cs.autoquest.plugin.alignment.SubstitutionMatrix#getDistance(int, int)
          */
-        public double getScore(int pos1, int pos2) {
+        public float getScore(int pos1, int pos2) {
                 int difference = Math.abs(input1[pos1]-input2[pos2]); 
                 if(difference < range) {
@@ -40 +40 @@
 
         @Override
-        public double getGapPenalty() {
+        public float getGapPenalty() {
                 return -range-1;
         }

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

@@ -16 +16 @@
 import de.ugoe.cs.util.console.Console;
 
+
+
 public class ObjectDistanceSubstitionMatrix implements SubstitutionMatrix {
 
         private HashMap<Integer, Integer> idmapping;
-        private TriangleMatrix matrix;
+        private ITriangleMatrix matrix;
         private HashSet<ITask> uniqueTasks;
-        private double gapPenalty;
+        private float gapPenalty;
         private int index = 0;
         private HashMap<Integer, LinkedList<IEventTaskInstance>> etisOfTasks;
         private boolean calculateNonTaskInstances = true;
+        private int firstRoundMaxIndex = 0;
 
         private double positiveThreshold;
 
         public ObjectDistanceSubstitionMatrix(
-                        float positiveThreshold, int gapPenalty,
-                        boolean calculateNonTaskInstances) {
-                
+                float positiveThreshold, int gapPenalty,
+                boolean calculateNonTaskInstances) {
                 this.positiveThreshold = positiveThreshold;
                 idmapping = new HashMap<Integer, Integer>();
@@ -40 +42 @@
         }
 
-        public double getGapPenalty() {
+        public float getGapPenalty() {
                 return gapPenalty;
         }
 
-        public void setGapPenalty(double gapPenalty) {
+        public void setGapPenalty(float gapPenalty) {
                 this.gapPenalty = gapPenalty;
         }
@@ -77 +79 @@
         //Just Calculate the distance between the new tasks and the matrix.
         public void update(LinkedList<ITask> newTasks) {
-                matrix.increaseSize(newTasks.size());
+
                 if (this.calculateNonTaskInstances) {
-                        Console.traceln(Level.INFO, "searching EventTasks in Tasks");
+                        try {
+                                matrix.increaseSize(newTasks.size());
+                                System.out.println("Subsitution matrix size is now " + matrix.size()*(matrix.size()+1)/2);
+                                Console.traceln(Level.INFO, "searching EventTasks in Tasks");
+                        } catch (Exception e) {
+                                Console.logException(e);
+                        }
                         this.updateEventTaskInstances(newTasks);
-                }
-                
+                        
                 for(Iterator<ITask> it = newTasks.iterator();it.hasNext();) {
                         int index1 = -1;
@@ -137 +144 @@
                         }
                 }
+                }
         }
 
         public void generate(HashSet<ITask> uniqueTasks) {
                 this.uniqueTasks = uniqueTasks;
-                matrix = new TriangleMatrix(uniqueTasks.size() + 1);
-                matrix.initialize(0);
                 if (this.calculateNonTaskInstances) {
+                        matrix = new DynamicTriangleMatrix(uniqueTasks.size() + 1);
                         Console.traceln(Level.INFO, "searching EventTasks in Tasks");
                         searchEventTaskInstances();
                 }
+                else{
+                        matrix = new StaticTriangleMatrix(uniqueTasks.size()+1);
+                }
+                matrix.initialize(0);
                 Console.traceln(Level.INFO, "calculating distances");
                 int index1 = -1;
@@ -197 +208 @@
                                         System.out.println("Unknown error");
                                 }
-
                                 matrix.set(index1, index2, distance);
 
                         }
                 }
-        }
+                this.firstRoundMaxIndex=index;
+        }
+        
+        private void computeDistance(ITask task1, ITask task2) {
+                
+                
+        }
+        
         
         
@@ -293 +310 @@
         }
 
-        public double getScore(int taskId1, int taskId2) {
+        public float getScore(int taskId1, int taskId2) {
                 if (taskId1 == Constants.GAP_SYMBOL
                                 || taskId1 == Constants.UNMATCHED_SYMBOL
                                 || taskId2 == Constants.GAP_SYMBOL
                                 || taskId2 == Constants.UNMATCHED_SYMBOL) {
-                        return 0.0;
+                        return 0;
+                } else if(this.calculateNonTaskInstances==false &&      
+                                (taskId1>this.firstRoundMaxIndex
+                                || taskId2>this.firstRoundMaxIndex)) {
+                        return 0;
                 } else {
                         Integer first = idmapping.get(taskId1);

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

@@ -11 +11 @@
         
 
-        public double getScore(int pos1, int pos2);
+        public float getScore(int pos1, int pos2);
 
-        public double getGapPenalty();
+        public float getGapPenalty();
 
         public void generate(HashSet<ITask> uniqueTasks);

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

@@ -3 +3 @@
 
 
-public class UPGMAMatrix extends TriangleMatrix {
+public class UPGMAMatrix extends StaticTriangleMatrix {
 
         public UPGMAMatrix(int size) {

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java

@@ -113 +113 @@
                 
                 // TODO: Debug output
+                /*
                 System.out.println("PRINTING MODEL: ");
                 for (int i = 0; i < subsequence.getSequence().getChildren().size(); i++) {
@@ -140 +141 @@
                 }
                 System.out.println();
-                
+                */
                 
                 //TODO: This is dirty!
@@ -151 +152 @@
                         }
                         ITask tempTask = model.getChildren().get(modelindex);
-                        System.out.println("Trying to add " + parent.get(startIndex)
-                                + " to the model instance " + tempTask);
+                        //System.out.println("Trying to add " + parent.get(startIndex)
+                        //      + " to the model instance " + tempTask);
                         if (tempTask.getType() == "optionality") {
                                                 
                                         if(((IMarkingTemporalRelationship) tempTask).getMarkedTask() == parent.get(startIndex).getTask()) {
-                                                System.out.println("Adding OptionalInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                                //System.out.println("Adding OptionalInstance " + parent.get(startIndex) + " to " + tempTask.getType());
                                                 IOptionalInstance optional = taskFactory.createNewTaskInstance((IOptional) tempTask);
                                                 taskBuilder.setChild(optional, parent.get(startIndex));
@@ -162 +163 @@
                                         }
                                         else {
-                                                System.out.println("Adding Empty optional, not deleting anything from the input sequence");
+                                                //System.out.println("Adding Empty optional, not deleting anything from the input sequence");
                                                 IOptionalInstance optional = taskFactory.createNewTaskInstance((IOptional) tempTask);
                                                 taskBuilder.addChild(subsequence, optional);
@@ -182 +183 @@
                                         }
                                         else if(parent.get(startIndex).getTask().getId() == tmpSel.getChildren().get(0).getId() || parent.get(startIndex).getTask().getId() == tmpSel.getChildren().get(1).getId() ) {
-                                                System.out.println("Session ID: " + parent.get(startIndex).getTask().getId() + " tmpSel(0): " + tmpSel.getChildren().get(0).getId() + " tmpSel(1): " +tmpSel.getChildren().get(1).getId()  );
+                                                //System.out.println("Session ID: " + parent.get(startIndex).getTask().getId() + " tmpSel(0): " + tmpSel.getChildren().get(0).getId() + " tmpSel(1): " +tmpSel.getChildren().get(1).getId()  );
                                                 continue;
                                         }
                                                 
                                         for (int k=0;k<selseq.getSequence().getChildren().size();k++) {
-                                                System.out.println("Trying to add " + parent.get(startIndex) + " to " + selseq);
+                                                //System.out.println("Trying to add " + parent.get(startIndex) + " to " + selseq);
                                                 taskBuilder.addChild(selseq,parent.get(startIndex));
                                                 taskBuilder.removeTaskInstance(parent, startIndex);
                                                 i++;
-                                                System.out.println("I:" + i);
-                                        }
-                                        System.out.println("Trying to add " + selseq + " to " + tmpSel);
+                                                //System.out.println("I:" + i);
+                                        }
+                                        //System.out.println("Trying to add " + selseq + " to " + tmpSel);
                                         taskBuilder.setChild(selection, selseq);
                                         taskBuilder.addChild(subsequence, selection);
@@ -201 +202 @@
                                 else
                                 {
-                                        System.out.println("Trying to adding SelectionInstance " + parent.get(startIndex) + " to " + tempTask);
+                                        //System.out.println("Trying to adding SelectionInstance " + parent.get(startIndex) + " to " + tempTask);
                                         taskBuilder.setChild(selection, parent.get(startIndex));
                                         taskBuilder.addChild(subsequence,selection);
                                 }
                         } else if (tempTask.getType() == "sequence") {
-                                System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask);
+                                //System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask);
                                 taskBuilder.addChild(subsequence, parent.get(startIndex));
                         } else if (tempTask.getType() == "iteration") {
-                                System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask);
+                                //System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask);
                                 taskBuilder.addChild(subsequence, parent.get(startIndex));
                         } else {
-                                System.out.println("Adding EventInstance " + parent.get(startIndex) + " to " + tempTask);
-                                System.out.println("Foo");
+                                //System.out.println("Adding EventInstance " + parent.get(startIndex) + " to " + tempTask);
+                                //System.out.println("Foo");
                                 taskBuilder.addChild(subsequence, parent.get(startIndex));
                         }

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/SequenceForTaskDetectionRuleAlignment.java

@@ -141 +141 @@
                 // Generate a substitution matrix between all occurring events.
                 Console.traceln(Level.INFO, "generating substitution matrix");
+                Console.traceln(Level.INFO,"Got " + appData.getUniqueTasks().size() + "tasks");
                 appData.getSubmat().generate(appData.getUniqueTasks());
                 
+                
+                Console.traceln(Level.INFO, "Starting main loop");
                 do {
+                        Console.traceln(Level.INFO, "Iteration Number: " + iteration);
                         iteration++;
-
+                        
                         appData.detectedAndReplacedTasks = false;
                         appData.getStopWatch().start("whole loop");
@@ -642 +646 @@
                                         MatchOccurence oc = it.next();
                                         
-                                        
+                                        /*
                                         if (iteration > 1) {
                                          
@@ -661 +665 @@
                                                                                 .get(j));
                                         }
-                                        }
+                                        }*/
                                         
                                         // Check if nothing has been replaced in the sequence we
@@ -773 +777 @@
                         stopWatch = new StopWatch();
                         result = new RuleApplicationResult();
-                        submat= new ObjectDistanceSubstitionMatrix(6,-3,true);
+                        submat= new ObjectDistanceSubstitionMatrix(6,-3,false);
                         newTasks = new LinkedList<ITask>();
                 }