Changeset 556

Timestamp:

08/16/12 17:27:26 (12 years ago)

Author:

sherbold

Message:

• adapted GUITAR plugin to new event core

Location:

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar

Files:

• EFGModelGenerator.java (modified) (8 diffs)
• GUITARTestCaseParser.java (modified) (2 diffs)
• commands/CMDefgTestCasesToSequences.java (modified) (1 diff)
• eventcore/EFGEvent.java (deleted)
• eventcore/GUITAREventTarget.java (added)
• eventcore/GUITAREventType.java (added)
• eventcore/GUITARReplayable.java (moved) (moved from trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/EFGReplayable.java) (3 diffs)

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/EFGModelGenerator.java

@@ -8 +8 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.plugin.guitar.eventcore.EFGEvent;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventTarget;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventType;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITARReplayable;
 import de.ugoe.cs.quest.ui.commands.CMDupdateModel;
 import de.ugoe.cs.quest.usageprofiles.DeterministicFiniteAutomaton;
@@ -44 +46 @@
                 EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class);
 
-                Collection<List<? extends Event<?>>> subsequences = generateEdgeSequences(efg);
+                Collection<List<Event>> subsequences = generateEdgeSequences(efg);
                 FirstOrderMarkovModel model = new FirstOrderMarkovModel(new Random());
                 model.train(subsequences);
@@ -63 +65 @@
                 EFG efg = (EFG) IO.readObjFromFile(efgFileName, EFG.class);
 
-                Collection<List<? extends Event<?>>> subsequences = generateEdgeSequences(efg);
+                Collection<List<Event>> subsequences = generateEdgeSequences(efg);
                 DeterministicFiniteAutomaton model = new DeterministicFiniteAutomaton(
                                 new Random());
@@ -81 +83 @@
          * @return edge sequence set
          */
-        private Collection<List<? extends Event<?>>> generateEdgeSequences(EFG efg) {
-                List<Event<?>> events = createEvents(efg);
+        private Collection<List<Event>> generateEdgeSequences(EFG efg) {
+                List<Event> events = createEvents(efg);
                 /*
                  * getEventGraph returns an adjacency matrix, i.e., a square matrix of
@@ -89 +91 @@
                  */
                 EventGraphType efgGraph = efg.getEventGraph();
-                Collection<List<? extends Event<?>>> subsequences = new LinkedList<List<? extends Event<?>>>();
+                Collection<List<Event>> subsequences = new LinkedList<List<Event>>();
 
                 int efgSize = events.size();
@@ -97 +99 @@
                                 // otherEvent is followed by currentEvent
                                 if (relation != GUITARConstants.NO_EDGE) {
-                                        List<Event<?>> edge = new LinkedList<Event<?>>();
+                                        List<Event> edge = new LinkedList<Event>();
                                         edge.add(events.get(row));
                                         edge.add(events.get(col));
@@ -116 +118 @@
          * @return list of events
          */
-        private List<Event<?>> createEvents(EFG efg) {
+        private List<Event> createEvents(EFG efg) {
                 List<EventType> efgEvents = efg.getEvents().getEvent();
-                List<Event<?>> myEvents = new ArrayList<Event<?>>(efgEvents.size());
+                List<Event> myEvents = new ArrayList<Event>(efgEvents.size());
                 for (EventType event : efgEvents) {
                         /*
@@ -124 +126 @@
                          * "interpretation" is found in the GUI file.
                          */
-                        Event<?> myEvent = new EFGEvent(event.getEventId());
-                        myEvent.setTarget(event.getWidgetId());
-                        myEvents.add(myEvent);
+                    GUITAREventType type = new GUITAREventType(event.getEventId());
+                    GUITAREventTarget target = new GUITAREventTarget(event.getWidgetId());
+                    Event myEvent = new Event(type, target);
+                    myEvent.addReplayable(new GUITARReplayable(event.getEventId()));
                 }
                 return myEvents;

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/GUITARTestCaseParser.java

@@ -6 +6 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.plugin.guitar.eventcore.EFGEvent;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventTarget;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITAREventType;
+import de.ugoe.cs.quest.plugin.guitar.eventcore.GUITARReplayable;
 import edu.umd.cs.guitar.model.IO;
 import edu.umd.cs.guitar.model.data.EFG;
@@ -70 +72 @@
          * @return event sequence describing the test case
          */
-        public List<Event<?>> parseTestCaseFile(File testcaseFile) {
+        public List<Event> parseTestCaseFile(File testcaseFile) {
                 TestCase testcase = (TestCase) IO.readObjFromFile(
                                 testcaseFile.getAbsolutePath(), TestCase.class);
                 List<StepType> steps = testcase.getStep();
-                List<Event<?>> sequence = new LinkedList<Event<?>>();
+                List<Event> sequence = new LinkedList<Event>();
                 for (StepType step : steps) {
                         String eventId = step.getEventId();
-                        EFGEvent event = new EFGEvent(eventId);
-                        event.setTarget(getWidgetId(eventId));
+                        GUITAREventType type = new GUITAREventType(eventId);
+                        GUITAREventTarget target = new GUITAREventTarget(getWidgetId(eventId));
+                        Event event = new Event(type, target);
+                        event.addReplayable(new GUITARReplayable(eventId));
                         sequence.add(event);
                 }

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/commands/CMDefgTestCasesToSequences.java

@@ -53 +53 @@
                         }
                 });
-                Collection<List<Event<?>>> sequences = new LinkedList<List<Event<?>>>();
+                Collection<List<Event>> sequences = new LinkedList<List<Event>>();
                 GUITARTestCaseParser parser;
                 if (efgFileName == null) {

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/plugin/guitar/eventcore/GUITARReplayable.java

@@ -12 +12 @@
  * @version 1.0
  */
-public class EFGReplayable implements IReplayable {
+public class GUITARReplayable implements IReplayable {
 
         /**
@@ -30 +30 @@
         /**
          * <p>
-         * Constructor. Creates a new {@link EFGReplayable}.
+         * Constructor. Creates a new {@link GUITARReplayable}.
          * </p>
          * 
          * @param eventId
          */
-        public EFGReplayable(String eventId) {
+        public GUITARReplayable(String eventId) {
                 this.eventId = eventId;
         }
@@ -54 +54 @@
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see de.ugoe.cs.quest.eventcore.IReplayable#getTarget()
-         */
-        @Override
-        public String getTarget() {
-                return null; // target indirectly included in replay through the eventId
-        }
-
 }