Changeset 227 for trunk

Timestamp:

09/30/11 19:31:43 (13 years ago)

Author:

sherbold

Message:

• extracted class de.ugoe.cs.eventbench.efg.EFGModelGenerator from de.ugoe.cs.eventbench.efg.commands.CMDefgToMM

+ added command efgToDFA

• extracted class de.ugoe.cs.eventbench.efg.GUITARTestCaseParser from de.ugoe.cs.eventbench.efg.commands.CMDefgTestCasesToSequences

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg

Files:

• EFGModelGenerator.java (added)
• GUITARTestCaseParser.java (added)
• commands/CMDefgTestCasesToSequences.java (modified) (4 diffs)
• commands/CMDefgToDFA.java (added)
• commands/CMDefgToMM.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/commands/CMDefgTestCasesToSequences.java

@@ -9 +9 @@
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.efg.data.EFGEvent;
+import de.ugoe.cs.eventbench.efg.GUITARTestCaseParser;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
-import edu.umd.cs.guitar.model.IO;
-import edu.umd.cs.guitar.model.data.StepType;
-import edu.umd.cs.guitar.model.data.TestCase;
 
 /**
@@ -34 +31 @@
         public void run(List<Object> parameters) {
                 String foldername;
-                String sequencesName = "sequences";
+                String sequencesName;
+                String efgFileName = null;
                 try {
                         foldername = (String) parameters.get(0);
-                        if (parameters.size() >= 2) {
-                                sequencesName = (String) parameters.get(1);
+                        sequencesName = (String) parameters.get(1);
+                        if (parameters.size() >= 3) {
+                                efgFileName = (String) parameters.get(2);
                         }
                 } catch (Exception e) {
@@ -48 +47 @@
                 File[] testcaseFiles = folder.listFiles();
                 Collection<List<Event<?>>> sequences = new LinkedList<List<Event<?>>>();
+                GUITARTestCaseParser parser;
+                if (efgFileName == null) {
+                        parser = new GUITARTestCaseParser();
+                } else {
+                        parser = new GUITARTestCaseParser(efgFileName);
+                }
                 for (File testcaseFile : testcaseFiles) {
                         Console.traceln("Loading from file "
                                         + testcaseFile.getAbsolutePath());
-                        TestCase testcase = (TestCase) IO.readObjFromFile(
-                                        testcaseFile.getAbsolutePath(), TestCase.class);
-                        List<StepType> steps = testcase.getStep();
-                        List<Event<?>> sequence = new LinkedList<Event<?>>();
-                        for (StepType step : steps) {
-                                step.getEventId();
-                                sequence.add(new EFGEvent(step.getEventId()));
-                                /*
-                                 * Problem: widgetId unknown! Therefore, the events will not be
-                                 * equal to those in the generated from a EFG.
-                                 */
-                        }
-                        sequences.add(sequence);
+                        sequences.add(parser.parseTestCaseFile(testcaseFile));
                 }
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
@@ -78 +71 @@
         @Override
         public void help() {
-                Console.println("Usage: efgTestCasesToSequences <folder> {<sequencesName>}");
+                Console.println("Usage: efgTestCasesToSequences <folder> <sequencesName> {<efgFileName>}");
         }
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/efg/commands/CMDefgToMM.java

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Random;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.efg.data.EFGEvent;
+import de.ugoe.cs.eventbench.efg.EFGModelGenerator;
 import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
-import edu.umd.cs.guitar.model.GUITARConstants;
-import edu.umd.cs.guitar.model.IO;
-import edu.umd.cs.guitar.model.data.EFG;
-import edu.umd.cs.guitar.model.data.EventGraphType;
-import edu.umd.cs.guitar.model.data.EventType;
 
 /**
@@ -47 +37 @@
                 }
 
-                EFG efg = (EFG) IO.readObjFromFile(filename, EFG.class);
-
-                // extracting the events from the EFG
-                List<EventType> efgEvents = efg.getEvents().getEvent();
-                List<Event<?>> myEvents = new ArrayList<Event<?>>(efgEvents.size());
-                for (EventType event : efgEvents) {
-                        /*
-                         * the widgetId and eventId are only hash values, the
-                         * "interpretation" is found in the GUI file.
-                         */
-                        Event<?> myEvent = new EFGEvent(event.getEventId());
-                        /*
-                         * The target is currently not set to event.widgetId() because the
-                         * WidgetId is not available when loading sequences in form of test
-                         * cases.
-                         */
-                        // myEvent.setTarget(event.getWidgetId(););
-                        myEvents.add(myEvent);
-                }
-
-                // extracting graph structure from the EFG
-                /*
-                 * getEventGraph returns an adjacency matrix, i.e., a square matrix of
-                 * efgEvents.size(), where a 1 in row i, column j means an edge
-                 * efgEvents.get(i)->efgEvents.get(j) exists.
-                 */
-                EventGraphType efgGraph = efg.getEventGraph();
-
-                FirstOrderMarkovModel model = new FirstOrderMarkovModel(new Random());
-                Collection<List<Event<?>>> subsequences = new LinkedList<List<Event<?>>>();
-
-                int efgSize = efgEvents.size();
-                for (int row = 0; row < efgSize; row++) {
-                        for (int col = 0; col < efgSize; col++) {
-                                int relation = efgGraph.getRow().get(row).getE().get(col);
-                                // otherEvent is followed by currentEvent
-                                if (relation != GUITARConstants.NO_EDGE) {
-                                        List<Event<?>> edge = new LinkedList<Event<?>>();
-                                        edge.add(myEvents.get(row));
-                                        edge.add(myEvents.get(col));
-                                        subsequences.add(edge);
-                                }
-                        }
-                }
-                model.train(subsequences);
+                EFGModelGenerator modelGenerator = new EFGModelGenerator();
+                FirstOrderMarkovModel model = modelGenerator
+                                .efgToFirstOrderMarkovModel(filename);
                 GlobalDataContainer.getInstance().addData(modelname, model);
         }