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

Timestamp:

08/11/14 08:22:13 (10 years ago)

Author:

rkrimmel

Message:

About to fix bug in containsPattern

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

@@ -17 +17 @@
 import java.util.Iterator;
 
+import org.apache.commons.lang.NotImplementedException;
+
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
@@ -46 +48 @@
         private static int idCounter = 0;
 
+        public static int missedOptionals = 0;
+        
         /**
          * <p>
@@ -107 +111 @@
                                 .createNewTaskInstance(model);
                 
-                for (int i=0; i<subsequence.getSequence().getChildren().size();i++) {
-                        System.out.println(subsequence.getSequence().getChildren().get(i));     
-                }
-                System.out.println();
-
+                //for (int i=0; i<subsequence.getSequence().getChildren().size();i++) {
+                //      System.out.println(subsequence.getSequence().getChildren().get(i));     
+                //}
+                System.out.println();
+                //TODO: This is dirty!
+                missedOptionals=0;
                 int modelindex=0;
                 for (int i = startIndex; i <= endIndex; i++) {
                         
+                        if(modelindex == model.getChildren().size()) {
+                                break;
+                        }
                         ITask tempTask = model.getChildren().get(modelindex);
                         //System.out.println("Trying to add " + parent.get(startIndex)
@@ -131 +139 @@
                                                 taskBuilder.addChild(subsequence, optional);
                                                 modelindex++;
-                                                i++;
+                                                missedOptionals++;
                                                 continue;
                                         }                               
@@ -142 +150 @@
                         } else if (tempTask.getType() == "sequence") {
                                 System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                //TODO: Implement this
+                                throw new NotImplementedException();
                                 
                         } else if (tempTask.getType() == "iteration") {
+                                //TODO: Implement this
                                 System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask.getType());
+                                throw new NotImplementedException();
                         } else {
                                 System.out.println("Adding EventInstance " + parent.get(startIndex) + " to " + tempTask.getType());
@@ -152 +164 @@
                         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);