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

Timestamp:

08/13/14 18:25:22 (10 years ago)

Author:

rkrimmel

Message:

Fixed first iteration of sequence detection and replacement

File:

• branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java (modified) (6 diffs)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation;
 
-import java.util.Iterator;
-
-import org.apache.commons.lang.NotImplementedException;
-
+import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.NumberSequence;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
@@ -129 +128 @@
                                                 
                                         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));
@@ -135 +134 @@
                                         }
                                         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);
@@ -143 +142 @@
                                         }                               
                         } else if (tempTask.getType() == "selection") {
-                                //System.out.println("Adding SelectionInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                System.out.println("Adding SelectionInstance " + parent.get(startIndex) + " to " + tempTask.getType());
                                 ISelectionInstance selection = taskFactory.createNewTaskInstance((ISelection) tempTask);
                                 taskBuilder.setChild(selection, parent.get(startIndex) );
@@ -149 +148 @@
 
                         } else if (tempTask.getType() == "sequence") {
-                                //System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask.getType());
-                                //TODO: Implement this
-                                throw new NotImplementedException();
+                                System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                ISequenceInstance sequence = taskFactory.createNewTaskInstance((ISequence) tempTask);
+                                taskBuilder.addChild(sequence,parent.get(startIndex));
                                 
                         } else if (tempTask.getType() == "iteration") {
-                                //TODO: Implement this
-                                //System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask.getType());
-                                throw new NotImplementedException();
+                                IIterationInstance iteration = taskFactory.createNewTaskInstance((IIteration) tempTask);
+                                taskBuilder.addChild(iteration,parent.get(startIndex));
+                                System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask.getType());
                         } else {
-                                //System.out.println("Adding EventInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                System.out.println("Adding EventInstance " + parent.get(startIndex) + " to " + tempTask.getType());
                                 taskBuilder.addChild(subsequence, parent.get(startIndex));
                         }
@@ -164 +163 @@
                         modelindex++;
                 }
-                /*
-                System.out.println();
-                System.out.println("Sequence instance:");
-                for(Iterator<ITaskInstance> it = subsequence.iterator();it.hasNext();) {
-                        System.out.println(it.next());
-                }*/
-                //System.out.println();
-                //System.out.println();
                 
                 taskBuilder.addTaskInstance(parent, startIndex, subsequence);