Changeset 2166 for trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgetTaskModelCrossCoverage.java

Timestamp:

09/07/17 16:22:04 (7 years ago)

Author:

pharms

Message:

• changes for first VR oriented usability evaluation

File:

• trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgetTaskModelCrossCoverage.java (modified) (4 diffs)

trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDgetTaskModelCrossCoverage.java

@@ -1769 +1769 @@
             Set<ISequence> sequences = getSequences(comparedModel);
             this.allSequencesOfComparedModel = sequences.size();
-            this.eventsCoveredBySequencesOfComparedModel = getEventsCoveredBySequences(sequences);
+            this.eventsCoveredBySequencesOfComparedModel =
+                TaskTreeUtils.getNoOfEventsCoveredBySequences(sequences);
             
             this.allEventsOfComparedWithModel = getAllEvents(comparedWithModel);
@@ -1775 +1776 @@
             this.allSequencesOfComparedWithModel = sequences.size();
             this.eventsCoveredBySequencesOfComparedWithModel =
-                getEventsCoveredBySequences(sequences);
+                TaskTreeUtils.getNoOfEventsCoveredBySequences(sequences);
         }
 
@@ -1946 +1947 @@
             
             int eventsCoveredByAllSequences =
-                getEventsCoveredBySequences(sequenceCoverage.keySet());
-            
-            int eventsCoveredByMostProminent = getEventsCoveredBySequences(mostProminentSequences);
+                TaskTreeUtils.getNoOfEventsCoveredBySequences(sequenceCoverage.keySet());
+            
+            int eventsCoveredByMostProminent =
+                TaskTreeUtils.getNoOfEventsCoveredBySequences(mostProminentSequences);
             
             int recalledActions = getRecalledActions();
@@ -2118 +2120 @@
          *
          */
-        private int getEventsCoveredBySequences(Set<ISequence> sequences) {
-            final Set<IEventTaskInstance> events = new HashSet<>();
-            
-            for (ISequence task : sequences) {
-                for (ITaskInstance instance : task.getInstances()) {
-                    instance.accept(new DefaultTaskInstanceTraversingVisitor() {
-                        @Override
-                        public void visit(IEventTaskInstance eventTaskInstance) {
-                            events.add(eventTaskInstance);
-                        }
-                    });
-                }
-            }
-            
-            return events.size();
-        }
-
-        /**
-         *
-         */
         private String formatPerc(int part, int of) {
             return (100 * part / of) + "% (" + part + "/" + of + ")";