Changeset 1976 for trunk

Timestamp:

06/24/15 11:29:20 (9 years ago)

Author:

pharms

Message:

• corrected harmonizing optionals
• corrected handling of integrate optional flatten instructions to not cover other instructions

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/CondenseSimilarTasksRule.java (modified) (9 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/CondenseSimilarTasksRule.java

@@ -188 +188 @@
         
         RuleApplicationData appData = new RuleApplicationData(sessions);
+        //int mergecount = 0;
         
         do {
             appData.setTaskModel(taskFactory.createTaskModel(sessions));
+            
+            /*mergecount++;
+            if ((mergecount > 140) && ((mergecount % 20) == 0)) {
+                System.out.println("performing validation " + mergecount);
+                new TaskTreeValidator().validate(appData.getTaskModel().getUserSessions(), true);
+            }*/
+            
+            
             appData.setMostSimilarTasks(null);
             
@@ -319 +328 @@
                         super.visit(optionalInstance);
                         
-                        if (optionalInstance.getChild() == null) {
-                            return;
-                        }
-                        
-                        // there may have been a model update at the child. If so, set the
-                        // new marked task
                         IOptional optional = optionalInstance.getOptional();
-                        ITask newChildTask = optionalInstance.getChild().getTask();
-                        
-                        if (newChildTask != optional.getMarkedTask()) {
-                            taskBuilder.setMarkedTask(optional, newChildTask);
-                        }
-                        
+
+                        if (optionalInstance.getChild() != null) {
+                            // there may have been a model update at the child. If so, set the
+                            // new marked task
+                            ITask newChildTask = optionalInstance.getChild().getTask();
+
+                            if (newChildTask != optional.getMarkedTask()) {
+                                taskBuilder.setMarkedTask(optional, newChildTask);
+                            }
+                        }
+
                         // check, if there is a harmonized optional
                         IOptional harmonizedOptional =
                             harmonizedOptionals.get(optional.getMarkedTask());
-                        
+
                         if ((harmonizedOptional != null) && (optional != harmonizedOptional)) {
                             // there is a harmonized optional --> set it as new task
@@ -869 +877 @@
         for (TaskPath path : leftHandSideTraversal.getTraversalPaths()) {
             for (FlattenInstruction instruction : result) {
-                if (instruction.matches(path)) {
+                if ((instruction.getInstruction() != FlattenInstruction.Instruction.INTEGRATE_OPTIONAL) &&
+                    (instruction.matches(path)))
+                {
                     continue OUTER;
                 }
@@ -880 +890 @@
         for (TaskPath path : rightHandSideTraversal.getTraversalPaths()) {
             for (FlattenInstruction instruction : result) {
-                if (instruction.matches(path)) {
+                if ((instruction.getInstruction() != FlattenInstruction.Instruction.INTEGRATE_OPTIONAL) &&
+                    (instruction.matches(path)))
+                {
                     continue OUTER;
                 }
@@ -982 +994 @@
                                  List<TaskPath>           previousPaths)
     {
-        boolean instructionApplied = false;
         
         TaskComparator comp = identTaskHandlStrat.getTaskComparator();
         
-        //System.out.println("applying instructions on " + taskPath);
+        // System.out.println("applying integrate optional instructions on " + taskPath);
+        
+        for (FlattenInstruction instruction : flattenInstructions) {
+            if ((instruction.getInstruction() == FlattenInstruction.Instruction.INTEGRATE_OPTIONAL) &&
+                (instruction.matches(taskPath)))
+            {
+                // System.out.print("found instruction ");
+                // instruction.dump(System.out);
+                TaskPath previousPath = previousPaths.size() > 0 ?
+                    previousPaths.get(previousPaths.size() - 1) : null;
+                
+                if (pathsMatch(instruction.getPrecedingPath(), previousPath)) {
+                    IOptional optional = instruction.getOptional();
+                    IOptionalInstance optionalInstance =
+                            taskFactory.createNewTaskInstance(optional);
+                    taskBuilder.addTaskInstance(session, optionalInstance);
+                }
+                
+                break;
+            }
+        }
+        
+        boolean instanceHandled = false;
+        // System.out.println("applying other instructions on " + taskPath);
         
         for (FlattenInstruction instruction : flattenInstructions) {
             if (instruction.matches(taskPath)) {
-                //System.out.print("found instruction ");
-                //instruction.dump(System.out);
+                // System.out.print("found instruction ");
+                // instruction.dump(System.out);
                 
                 switch (instruction.getInstruction()) {
@@ -998 +1032 @@
                             taskBuilder.addTaskInstance(session, instance);
                         }
-                        instructionApplied = true;
+                        instanceHandled = true;
                         break;
                     }
                     case MAKE_OPTIONAL: {
-                        instructionApplied = true;
-
+                        instanceHandled = true;
+                        
                         if (instance == null) {
                             break;
@@ -1030 +1064 @@
                     }
                     case MAKE_SELECTION: {
-                        instructionApplied = true;
+                        instanceHandled = true;
 
                         if (instance == null) {
@@ -1072 +1106 @@
                     }
                     case INTEGRATE_OPTIONAL: {
-                        TaskPath previousPath = previousPaths.size() > 0 ?
-                            previousPaths.get(previousPaths.size() - 1) : null;
-                        
-                        if (pathsMatch(instruction.getPrecedingPath(), previousPath)) {
-                            IOptional optional = instruction.getOptional();
-                            IOptionalInstance optionalInstance =
-                                    taskFactory.createNewTaskInstance(optional);
-                            taskBuilder.addTaskInstance(session, optionalInstance);
-                        }
-                        
-                        if (instance != null) {
-                            taskBuilder.addTaskInstance(session, instance);
-                        }
-                        
-                        instructionApplied = true;
+                        // have been applied beforehand
                         break;
                     }
@@ -1095 +1115 @@
             }
             
-            if (instructionApplied) {
+            if (instanceHandled) {
                 break;
             }
         }
         
-        if (!instructionApplied) {
+        if (!instanceHandled) {
             ITask task = taskPath.getLast();
             if (task instanceof IIteration) {