Changeset 2166 for trunk

Timestamp:

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

Author:

pharms

Message:

• changes for first VR oriented usability evaluation

Location:

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

Files:

• sequences/CMDeventStatistics.java (added)
• sequences/CMDtargetStatistics.java (added)
• usability/CMDevaluateUsability.java (modified) (3 diffs)
• usability/CMDgetTaskModelCrossCoverage.java (modified) (4 diffs)
• usability/CMDtaskTreeStatistics.java (modified) (3 diffs)
• usability/CMDusabilityStatistics.java (added)

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

@@ -43 +43 @@
     @Override
     public String help() {
-        return "evaluateUsability <tasktree> {<maxCount>} {<evaluationResult>}";
+        return "evaluateUsability <tasktree> {<maxCount>} {<evaluationResult>} {-mostRepresentativeTasksOnly}";
     }
 
@@ -56 +56 @@
         String evaluationResult = null;
         int maxCount = Integer.MAX_VALUE;
+        boolean onlyMostRepresentativeTasks = false;
+        
         try {
             for (Object parameter : parameters) {
-                if (tasktreeName == null) {
+                if ("-mostRepresentativeTasksOnly".equals(parameter)) {
+                    onlyMostRepresentativeTasks = true;
+                }
+                else if (tasktreeName == null) {
                     tasktreeName = (String) parameter;
                 }
@@ -96 +101 @@
         ITaskModel taskTree = (ITaskModel) dataObject;
         
-        UsabilityEvaluationResult result =
-            new UsabilityEvaluationManager().evaluateUsability(taskTree, maxCount);
+        UsabilityEvaluationResult result = new UsabilityEvaluationManager().evaluateUsability
+            (taskTree, maxCount, onlyMostRepresentativeTasks);
         
         if (GlobalDataContainer.getInstance().addData(evaluationResult, result)) {

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 + ")";

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

@@ -149 +149 @@
             TaskTreeUtils.getMostProminentTasks(taskModel, taskModel.getTasks());
         
-        Set<IEventTaskInstance> mpCoveredEvents = new HashSet<IEventTaskInstance>();
-       
-        for (ITask task : mostProminent) {
-            getCoveredEvents(task, mpCoveredEvents);
-        }
+        
+        int mpCoveredEvents =
+            TaskTreeUtils.getNoOfEventsCoveredBySequences(mostProminent);
         
         Console.println(noOfSequences + " sequences cover " +
@@ -161 +159 @@
         Console.println(mostProminent.size() + " of " + noOfSequences + " sequences (" +
                         formatPercent(mostProminent.size(), noOfSequences) + ") cover " +
-                        mpCoveredEvents.size() + " of " + allEvents + " recorded events (" +
-                        formatPercent(mpCoveredEvents.size(), allEvents) + ")");
+                        mpCoveredEvents + " of " + allEvents + " recorded events (" +
+                        formatPercent(mpCoveredEvents, allEvents) + ")");
         
         Console.println("CSV: " + tasktreeName + ";" + noOfEventTasks + ";" + noOfSequences + ";" +
@@ -170 +168 @@
                         mostProminent.size() + ";" +
                         formatPercent(mostProminent.size(), noOfSequences) + ";" +
-                        mpCoveredEvents.size() + ";" +
-                        formatPercent(mpCoveredEvents.size(), allEvents));
+                        mpCoveredEvents + ";" + formatPercent(mpCoveredEvents, allEvents));
     }