Index: /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java =================================================================== --- /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java (revision 546) +++ /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorObserved.java (revision 547) @@ -26,5 +26,5 @@ *

*/ - private final Collection>> sequences; + private final Collection> sequences; /** @@ -33,5 +33,5 @@ *

*/ - private final Collection>> observedSequences; + private final Collection> observedSequences; /** @@ -48,5 +48,5 @@ *

*/ - private Collection>> subSeqsGenerated = null; + private Collection> subSeqsGenerated = null; /** @@ -55,5 +55,5 @@ *

*/ - private Collection>> subSeqsObserved = null; + private Collection> subSeqsObserved = null; /** @@ -77,6 +77,6 @@ */ public CoverageCalculatorObserved( - Collection>> observedSequences, - Collection>> sequences, int length) { + Collection> observedSequences, + Collection> sequences, int length) { if (observedSequences == null) { throw new InvalidParameterException( @@ -105,5 +105,5 @@ public double getCoverageObserved() { createSubSeqs(); - Collection>> subSeqsObservedCopy = new LinkedHashSet>>( + Collection> subSeqsObservedCopy = new LinkedHashSet>( subSeqsObserved); subSeqsObservedCopy.retainAll(subSeqsGenerated); @@ -125,12 +125,12 @@ public double getCoverageObservedWeigth(IStochasticProcess process) { createSubSeqs(); - Map>, Double> weightMap = SequenceTools + Map, Double> weightMap = SequenceTools .generateWeights(process, subSeqsObserved); - Collection>> subSeqsObservedCopy = new LinkedHashSet>>( + Collection> subSeqsObservedCopy = new LinkedHashSet>( subSeqsObserved); subSeqsObservedCopy.retainAll(subSeqsGenerated); double weight = 0.0d; - for (List> subSeq : subSeqsObservedCopy) { + for (List subSeq : subSeqsObservedCopy) { weight += weightMap.get(subSeq); } @@ -149,5 +149,5 @@ public double getNewPercentage() { createSubSeqs(); - Collection>> subSeqsGeneratedCopy = new LinkedHashSet>>( + Collection> subSeqsGeneratedCopy = new LinkedHashSet>( subSeqsGenerated); subSeqsGeneratedCopy.removeAll(subSeqsObserved); @@ -174,7 +174,7 @@ } createSubSeqs(); - Collection>> subSeqsGeneratedCopy = new LinkedHashSet>>( - subSeqsGenerated); - Collection>> subSeqsPossible = process + Collection> subSeqsGeneratedCopy = new LinkedHashSet>( + subSeqsGenerated); + Collection> subSeqsPossible = process .generateSequences(length); subSeqsGeneratedCopy.removeAll(subSeqsObserved); @@ -204,14 +204,14 @@ } createSubSeqs(); - Collection>> subSeqsGeneratedCopy = new LinkedHashSet>>( - subSeqsGenerated); - Collection>> subSeqsPossible = process + Collection> subSeqsGeneratedCopy = new LinkedHashSet>( + subSeqsGenerated); + Collection> subSeqsPossible = process .generateSequences(length); subSeqsGeneratedCopy.removeAll(subSeqsObserved); subSeqsPossible.removeAll(subSeqsObserved); - Map>, Double> weightMap = SequenceTools + Map, Double> weightMap = SequenceTools .generateWeights(process, subSeqsPossible); double weight = 0.0d; - for (List> subSeq : subSeqsGeneratedCopy) { + for (List subSeq : subSeqsGeneratedCopy) { Double currentWeight = weightMap.get(subSeq); if( currentWeight!=null ) { @@ -248,5 +248,5 @@ public int getNumNew() { createSubSeqs(); - Collection>> subSeqsGeneratedCopy = new LinkedHashSet>>( + Collection> subSeqsGeneratedCopy = new LinkedHashSet>( subSeqsGenerated); subSeqsGeneratedCopy.removeAll(subSeqsObserved); Index: /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java =================================================================== --- /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java (revision 546) +++ /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.java (revision 547) @@ -33,5 +33,5 @@ *

*/ - private Collection>> sequences; + private Collection> sequences; /** @@ -48,5 +48,5 @@ *

*/ - private Collection>> containedSubSeqs = null; + private Collection> containedSubSeqs = null; /** @@ -56,5 +56,5 @@ *

*/ - private Collection>> allPossibleSubSeqs = null; + private Collection> allPossibleSubSeqs = null; /** @@ -64,5 +64,5 @@ *

*/ - private Map>, Double> subSeqWeights = null; + private Map, Double> subSeqWeights = null; /** @@ -85,5 +85,5 @@ */ public CoverageCalculatorProcess(IStochasticProcess process, - Collection>> sequences, int length) { + Collection> sequences, int length) { if (process == null) { throw new InvalidParameterException("process must not be null"); @@ -159,5 +159,5 @@ } double weight = 0.0; - for (List> subSeq : containedSubSeqs) { + for (List subSeq : containedSubSeqs) { Double curWeight = subSeqWeights.get(subSeq); if( curWeight!=null ) { @@ -208,5 +208,5 @@ * thrown is newSequences is null */ - public void setSequences(Collection>> newSequences) { + public void setSequences(Collection> newSequences) { if (newSequences == null) { throw new InvalidParameterException("sequences must not be null"); Index: /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java =================================================================== --- /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java (revision 546) +++ /trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java (revision 547) @@ -46,12 +46,12 @@ * @return {@link Map} of weights */ - public static Map>, Double> generateWeights( + public static Map, Double> generateWeights( IStochasticProcess process, - Collection>> sequences) { - Map>, Double> subSeqWeights = new LinkedHashMap>, Double>(); + Collection> sequences) { + Map, Double> subSeqWeights = new LinkedHashMap, Double>(); if (sequences != null && !sequences.isEmpty()) { if (process != null) { double sum = 0.0; - for (List> sequence : sequences) { + for (List sequence : sequences) { double prob = process.getProbability(sequence); subSeqWeights.put(sequence, prob); @@ -59,5 +59,5 @@ } if (sum < 1.0) { - for (Map.Entry>, Double> entry : subSeqWeights + for (Map.Entry, Double> entry : subSeqWeights .entrySet()) { entry.setValue(entry.getValue() / sum); @@ -65,5 +65,5 @@ } } else { - for( List> sequence : sequences ) { + for( List sequence : sequences ) { subSeqWeights.put(sequence, 0.0d); } @@ -114,16 +114,16 @@ * thrown if length less or equal to 0 */ - public static Set>> containedSubSequences( - Collection>> sequences, int length) { + public static Set> containedSubSequences( + Collection> sequences, int length) { if (length <= 0) { throw new InvalidParameterException( "length must be a positive integer"); } - Set>> containedSubSeqs = new LinkedHashSet>>(); + Set> containedSubSeqs = new LinkedHashSet>(); if (sequences != null) { - for (List> sequence : sequences) { - List> subSeq = new LinkedList>(); + for (List sequence : sequences) { + List subSeq = new LinkedList(); boolean minLengthReached = false; - for (Event event : sequence) { + for (Event event : sequence) { subSeq.add(event); if (!minLengthReached) { @@ -136,5 +136,5 @@ if (minLengthReached) { if (!containedSubSeqs.contains(subSeq)) { - containedSubSeqs.add(new LinkedList>( + containedSubSeqs.add(new LinkedList( subSeq)); } Index: /trunk/quest-core-events-test/pom.xml =================================================================== --- /trunk/quest-core-events-test/pom.xml (revision 546) +++ /trunk/quest-core-events-test/pom.xml (revision 547) @@ -1,138 +1,145 @@ - - 4.0.0 - de.ugoe.cs.quest - quest-core-events-test - 0.0.1-SNAPSHOT - quest-core-events-test - - https://quest.informatik.uni-goettingen.de/svn/quest/trunk/quest-core-events-test - - - - de.ugoe.cs.quest - quest-core-events - 0.0.1-SNAPSHOT - test - - - junit - junit - 4.8.1 - test - - - junit-addons - junit-addons - 1.4 - - - nl.jqno.equalsverifier - equalsverifier - 1.1.3 - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [1.0.0,) - - unpack - - - - - - - - - org.codehaus.mojo - emma-maven-plugin - [1.0-alpha-3,) - - emma - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - unpack - process-classes - - unpack - - - - - de.ugoe.cs.quest - quest-core-events - 0.0.1-SNAPSHOT - ${project.build.directory}/classes - - - - - - - - org.codehaus.mojo - emma-maven-plugin - 1.0-alpha-3 - true - - - process-classes - - emma - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.2 - - - - test-jar - - - - - - + + 4.0.0 + de.ugoe.cs.quest + quest-core-events-test + 0.0.1-SNAPSHOT + quest-core-events-test + + https://quest.informatik.uni-goettingen.de/svn/quest/trunk/quest-core-events-test + + + + de.ugoe.cs.quest + quest-core-events + 0.0.1-SNAPSHOT + test + + + junit + junit + 4.8.1 + test + + + junit-addons + junit-addons + 1.4 + + + nl.jqno.equalsverifier + equalsverifier + 1.1.3 + + + org.mockito + mockito-core + 1.9.0 + test + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [1.0.0,) + + unpack + + + + + + + + + org.codehaus.mojo + emma-maven-plugin + [1.0-alpha-3,) + + emma + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + unpack + process-classes + + unpack + + + + + de.ugoe.cs.quest + quest-core-events + 0.0.1-SNAPSHOT + ${project.build.directory}/classes + + + + + + + + org.codehaus.mojo + emma-maven-plugin + 1.0-alpha-3 + true + + + process-classes + + emma + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + + test-jar + + + + + + Index: /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java =================================================================== --- /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java (revision 546) +++ /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/SequenceInstanceOfTest.java (revision 547) @@ -25,6 +25,6 @@ @Test public void TestIsCollectionOfSequences_1() throws Exception { - Collection>> sequences = new LinkedList>>(); - List> sequence1 = new ArrayList>(); + Collection> sequences = new LinkedList>(); + List sequence1 = new ArrayList(); sequence1.add(new Event("a")); sequences.add(sequence1); @@ -36,6 +36,6 @@ @Test public void TestIsCollectionOfSequences_2() throws Exception { - Collection>> sequences = new LinkedList>>(); - List> sequence1 = new ArrayList>(); + Collection> sequences = new LinkedList>(); + List sequence1 = new ArrayList(); sequences.add(sequence1); @@ -46,5 +46,5 @@ @Test public void TestIsCollectionOfSequences_3() throws Exception { - Collection>> sequences = new LinkedList>>(); + Collection> sequences = new LinkedList>(); boolean result = SequenceInstanceOf.isCollectionOfSequences(sequences); @@ -66,5 +66,5 @@ @Test public void TestIsEventSequence_1() throws Exception { - List> sequence = new ArrayList>(); + List sequence = new ArrayList(); sequence.add(new Event("a")); @@ -75,5 +75,5 @@ @Test public void TestIsEventSequence_2() throws Exception { - List> sequence = new ArrayList>(); + List sequence = new ArrayList(); boolean result = SequenceInstanceOf.isEventSequence(sequence); Index: /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java =================================================================== --- /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java (revision 546) +++ /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/EventTest.java (revision 547) @@ -1,17 +1,15 @@ + package de.ugoe.cs.quest.eventcore; -import nl.jqno.equalsverifier.EqualsVerifier; -import nl.jqno.equalsverifier.Warning; import org.junit.*; import de.ugoe.cs.quest.eventcore.Event; -import de.ugoe.cs.quest.eventcore.ReplayableEvent; import static org.junit.Assert.*; +import static org.mockito.Mockito.*; /** - * The class EventTest contains tests for the class - * {@link Event}. + * The class EventTest contains tests for the class {@link Event}. * * @author Steffen Herbold @@ -20,387 +18,214 @@ public class EventTest { - @Test - public void testEvent_1() throws Exception { - String type = "typeString"; - - Event result = new Event(type); - - assertNotNull(result); - assertEquals(type, result.type); - assertNull(result.target); - assertNull(result.targetShort); - assertEquals("", result.idInfo); - } - - @Test(expected = java.security.InvalidParameterException.class) - public void testEvent_2() throws Exception { - new Event(null); - } - - @Test - public void testEquals_1() throws Exception { - String type1 = "typeString"; - String type2 = "typeString"; - Event fixture = new Event(type1); - Event other = new Event(type2); - - boolean result = fixture.equals(other); - - assertTrue(result); - } - - @Test - public void testEquals_2() throws Exception { - String type1 = "typeString1"; - String type2 = "typeString2"; - Event fixture = new Event(type1); - Event other = new Event(type2); - - boolean result = fixture.equals(other); - - assertFalse(result); - } - - @Test - public void testEquals_3() throws Exception { - String type1 = "typeString"; - String type2 = "typeString"; - String target1 = "target"; - String target2 = "target"; - Event fixture = new Event(type1); - fixture.target = target1; - Event other = new Event(type2); - other.target = target2; - - boolean result = fixture.equals(other); - - assertTrue(result); - } - - @Test - public void testEquals_4() throws Exception { - String type1 = "typeString1"; - String type2 = "typeString2"; - String target1 = "target"; - String target2 = "target"; - Event fixture = new Event(type1); - fixture.target = target1; - Event other = new Event(type2); - other.target = target2; - - boolean result = fixture.equals(other); - - assertFalse(result); - } - - @Test - public void testEquals_5() throws Exception { - String type1 = "typeString"; - String type2 = "typeString"; - String target1 = "target1"; - String target2 = "target2"; - Event fixture = new Event(type1); - fixture.target = target1; - Event other = new Event(type2); - other.target = target2; - - boolean result = fixture.equals(other); - - assertFalse(result); - } - - @Test - public void testEquals_6() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - boolean result = fixture.equals(fixture); - - assertTrue(result); - } - - @Test - public void testEqualsContract() throws Exception { - EqualsVerifier.forClass(Event.class) - .suppress(Warning.NONFINAL_FIELDS).withRedefinedSubclass(ReplayableEvent.class) - .verify(); - } - - @Test - public void testGetIdInfo_fixture_1() throws Exception { - String type = "typeString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.idInfo = idInfo; - - String result = fixture.getIdInfo(); - - assertEquals(idInfo, result); - } - - @Test - public void testGetShortId_1() throws Exception { - String type = "typeString"; - String targetShort = "targetShortString"; - Event fixture = new Event(type); - fixture.targetShort = targetShort; - - String result = fixture.getShortId(); - - assertEquals("targetShortString.typeString", result); - } - - @Test - public void testGetShortId_2() throws Exception { - String type = "typeString"; - String targetShort = "targetShortString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.targetShort = targetShort; - fixture.idInfo = idInfo; - - String result = fixture.getShortId(); - - assertEquals("targetShortString.typeString.idInfoString", result); - } - - @Test - public void testGetShortId_3() throws Exception { - String type = "typeString"; - String target = "targetString"; - Event fixture = new Event(type); - fixture.target = target; - - String result = fixture.getShortId(); - - assertEquals("targetString.typeString", result); - } - - @Test - public void testGetStandardId_1() throws Exception { - String type = "typeString"; - String target = "targetString"; - Event fixture = new Event(type); - fixture.target = target; - - String result = fixture.getStandardId(); - - assertEquals("targetString.typeString", result); - } - - @Test - public void testGetStandardId_2() throws Exception { - String type = "typeString"; - String target = "targetString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.target = target; - fixture.idInfo = idInfo; - - String result = fixture.getStandardId(); - - assertEquals("targetString.typeString.idInfoString", result); - } - - @Test - public void testGetStandardId_3() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - String result = fixture.getStandardId(); - - assertEquals("typeString", result); - } - - @Test - public void testGetStandardId_4() throws Exception { - String type = "typeString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.idInfo = idInfo; - - String result = fixture.getStandardId(); - - assertEquals("typeString.idInfoString", result); - } - - @Test - public void testGetTarget_1() throws Exception { - String type = "typeString"; - String target = "targetString"; - Event fixture = new Event(type); - fixture.target = target; - - String result = fixture.getTarget(); - - assertEquals(target, result); - } - - @Test - public void testGetTarget_2() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - String result = fixture.getTarget(); - - assertNull(result); - } - - @Test - public void testGetTargetShort_1() throws Exception { - String type = "typeString"; - String targetShort = "targetShort"; - Event fixture = new Event(type); - fixture.targetShort = targetShort; - - String result = fixture.getTargetShort(); - - assertEquals(targetShort, result); - } - - @Test - public void testGetTargetShort_2() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - String result = fixture.getTargetShort(); - - assertNull(result); - } - - @Test - public void testGetType_1() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - String result = fixture.getType(); - - assertEquals(type, result); - } - - @Test - public void testSetIdInfo_fixture_1() throws Exception { - String type = "typeString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - - fixture.setIdInfo(idInfo); - - assertEquals(idInfo, fixture.idInfo); - } - - @Test - public void testSetIdInfo_2() throws Exception { - String type = "typeString"; - String idInfo = null; - Event fixture = new Event(type); - - fixture.setIdInfo(idInfo); - - assertEquals(idInfo, fixture.idInfo); - } - - @Test - public void testSetTarget_1() throws Exception { - String type = "typeString"; - String target = "targetString"; - Event fixture = new Event(type); - - boolean result = fixture.setTarget(target); - - assertTrue(result); - assertEquals(target, fixture.target); - } - - @Test - public void testSetTarget_2() throws Exception { - String type = "typeString"; - String target1 = "targetString1"; - String target2 = "targetString2"; - Event fixture = new Event(type); - fixture.target = target1; - - boolean result = fixture.setTarget(target2); - - assertFalse(result); - assertEquals(target1, fixture.target); - } - - @Test - public void testSetTargetShort_1() throws Exception { - String type = "typeString"; - String targetShort = "targetShortString"; - Event fixture = new Event(type); - - boolean result = fixture.setTargetShort(targetShort); - - assertTrue(result); - assertEquals(targetShort, fixture.targetShort); - } - - @Test - public void testSetTargetShort_2() throws Exception { - String type = "typeString"; - String targetShort1 = "targetShortString1"; - String targetShort2 = "targetShortString2"; - Event fixture = new Event(type); - fixture.targetShort = targetShort1; - - boolean result = fixture.setTargetShort(targetShort2); - - assertFalse(result); - assertEquals(targetShort1, fixture.targetShort); - } - - @Test - public void testToString_1() throws Exception { - String type = "typeString"; - String target = "targetString"; - Event fixture = new Event(type); - fixture.target = target; - - String result = fixture.toString(); - - assertEquals("targetString.typeString", result); - } - - @Test - public void testToString_2() throws Exception { - String type = "typeString"; - String target = "targetString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.target = target; - fixture.idInfo = idInfo; - - String result = fixture.toString(); - - assertEquals("targetString.typeString.idInfoString", result); - } - - @Test - public void testToString_3() throws Exception { - String type = "typeString"; - Event fixture = new Event(type); - - String result = fixture.toString(); - - assertEquals("typeString", result); - } - - @Test - public void testToString_4() throws Exception { - String type = "typeString"; - String idInfo = "idInfoString"; - Event fixture = new Event(type); - fixture.idInfo = idInfo; - - String result = fixture.toString(); - - assertEquals("typeString.idInfoString", result); - } - - public static void main(String[] args) { - new org.junit.runner.JUnitCore().run(EventTest.class); - } + @Test + public void testEvent_1() throws Exception { + Event result = new Event(mock(IEventType.class)); + + assertNotNull(result); + } + + @Test(expected = java.security.InvalidParameterException.class) + public void testEvent_2() throws Exception { + new Event(null); + } + + /* + @Test + public void testEquals_1() throws Exception { + IEventType type1 = mock(IEventType.class); + IEventType type2 = mock(IEventType.class); + // when(type1.equals(type2)).thenReturn(true); + Event fixture = new Event(type1); + Event other = new Event(type2); + + boolean result = fixture.equals(other); + + assertTrue(result); + } + + @Test + public void testEquals_2() throws Exception { + String type1 = "typeString1"; + String type2 = "typeString2"; + Event fixture = new Event(type1); + Event other = new Event(type2); + + boolean result = fixture.equals(other); + + assertFalse(result); + } + + @Test + public void testEquals_3() throws Exception { + String type1 = "typeString"; + String type2 = "typeString"; + String target1 = "target"; + String target2 = "target"; + Event fixture = new Event(type1); + fixture.target = target1; + Event other = new Event(type2); + other.target = target2; + + boolean result = fixture.equals(other); + + assertTrue(result); + } + + @Test + public void testEquals_4() throws Exception { + String type1 = "typeString1"; + String type2 = "typeString2"; + String target1 = "target"; + String target2 = "target"; + Event fixture = new Event(type1); + fixture.target = target1; + Event other = new Event(type2); + other.target = target2; + + boolean result = fixture.equals(other); + + assertFalse(result); + } + + @Test + public void testEquals_5() throws Exception { + String type1 = "typeString"; + String type2 = "typeString"; + String target1 = "target1"; + String target2 = "target2"; + Event fixture = new Event(type1); + fixture.target = target1; + Event other = new Event(type2); + other.target = target2; + + boolean result = fixture.equals(other); + + assertFalse(result); + } + + @Test + public void testEquals_6() throws Exception { + String type = "typeString"; + Event fixture = new Event(type); + + boolean result = fixture.equals(fixture); + + assertTrue(result); + } + + @Test + public void testEqualsContract() throws Exception { + EqualsVerifier.forClass(Event.class).suppress(Warning.NONFINAL_FIELDS) + .withRedefinedSubclass(ReplayableEvent.class).verify(); + } + */ + + @Test + public void testGetTarget_1() throws Exception { + IEventType type = mock(IEventType.class); + IEventTarget target = mock(IEventTarget.class); + + Event fixture = new Event(type); + fixture.setTarget(target); + + IEventTarget result = fixture.getTarget(); + + assertSame(target, result); + } + + + + @Test + public void testGetTarget_2() throws Exception { + IEventType type = mock(IEventType.class); + IEventTarget target = mock(IEventTarget.class); + + Event fixture = new Event(type, target); + + IEventTarget result = fixture.getTarget(); + + assertSame(target, result); + } + + @Test + public void testGetTarget_3() throws Exception { + IEventType type = mock(IEventType.class); + + Event fixture = new Event(type); + + IEventTarget result = fixture.getTarget(); + + assertNull(result); + } + + @Test + public void testGetType_1() throws Exception { + IEventType type = mock(IEventType.class); + + Event fixture = new Event(type); + + IEventType result = fixture.getType(); + + assertEquals(type, result); + } + + @Test + public void testSetTarget_1() throws Exception { + IEventType type = mock(IEventType.class); + IEventTarget target = mock(IEventTarget.class); + + Event fixture = new Event(type); + + boolean result = fixture.setTarget(target); + + assertTrue(result); + assertEquals(target, fixture.getTarget()); + } + + @Test + public void testSetTarget_2() throws Exception { + IEventType type = mock(IEventType.class); + IEventTarget target1 = mock(IEventTarget.class); + IEventTarget target2 = mock(IEventTarget.class); + + Event fixture = new Event(type); + + fixture.setTarget(target1); + boolean result = fixture.setTarget(target2); + + assertFalse(result); + assertEquals(target1, fixture.target); + } + + @Test + public void testSetTarget_3() throws Exception { + IEventType type = mock(IEventType.class); + IEventTarget target1 = mock(IEventTarget.class); + IEventTarget target2 = mock(IEventTarget.class); + + Event fixture = new Event(type, target1); + + boolean result = fixture.setTarget(target2); + + assertFalse(result); + assertEquals(target1, fixture.target); + } + + @Test + public void testToString_1() throws Exception { + IEventType type = mock(IEventType.class); + when(type.toString()).thenReturn("typeString"); + IEventTarget target = mock(IEventTarget.class); + when(target.toString()).thenReturn("targetString"); + + Event fixture = new Event(type, target); + + String result = fixture.toString(); + + assertEquals("(typeString;targetString)", result); + } + + public static void main(String[] args) { + new org.junit.runner.JUnitCore().run(EventTest.class); + } } Index: unk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/TestAll.java =================================================================== --- /trunk/quest-core-events-test/src/test/java/de/ugoe/cs/quest/eventcore/TestAll.java (revision 546) +++ (revision ) @@ -1,25 +1,0 @@ -package de.ugoe.cs.quest.eventcore; - -import org.junit.runner.JUnitCore; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * The class TestAll builds a suite that can be used to run all - * of the tests within its package as well as within any subpackages of its - * package. - * - * @author Steffen Herbold - * @version 1.0 - */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - EventTest.class, - ReplayableEventTest.class -}) -public class TestAll { - - public static void main(String[] args) { - JUnitCore.runClasses(new Class[] { TestAll.class }); - } -} Index: /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java =================================================================== --- /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java (revision 546) +++ /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java (revision 547) @@ -127,5 +127,5 @@ * @return the test suite */ - public Collection>> generateTestSuite( + public Collection> generateTestSuite( IStochasticProcess model) { if (model == null) { @@ -133,5 +133,5 @@ } - Collection>> sequences = new LinkedHashSet>>(); + Collection> sequences = new LinkedHashSet>(); for (int length = minLength; length <= maxLength; length++) { if (validEnd) { @@ -145,5 +145,5 @@ List probabilities = new ArrayList(sequences.size()); double probSum = 0.0; - for (List> sequence : sequences) { + for (List sequence : sequences) { double prob = model.getProbability(sequence); probabilities.add(prob); @@ -167,7 +167,7 @@ } } - Collection>> retainedSequences = new LinkedList>>(); + Collection> retainedSequences = new LinkedList>(); int index = 0; - for (List> sequence : sequences) { + for (List sequence : sequences) { if (drawnSequences.contains(index)) { retainedSequences.add(sequence); Index: /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java =================================================================== --- /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java (revision 546) +++ /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java (revision 547) @@ -107,5 +107,5 @@ * @return the test suite */ - public Collection>> generateTestSuite( + public Collection> generateTestSuite( IStochasticProcess model) { if (model == null) { @@ -113,7 +113,7 @@ } - Collection>> sequences = new LinkedHashSet>>(); - - List>> seqsTmp = new ArrayList>>( + Collection> sequences = new LinkedHashSet>(); + + List> seqsTmp = new ArrayList>( model.generateSequences(maxLengthAll + 1, true)); @@ -122,5 +122,5 @@ List probabilities = new ArrayList(seqsTmp.size()); double probSum = 0.0; - for (List> sequence : seqsTmp) { + for (List sequence : seqsTmp) { double prob = model.getProbability(sequence); probabilities.add(prob); @@ -140,7 +140,7 @@ sum += currentProb; } - List> seqTmp = seqsTmp.get(index); + List seqTmp = seqsTmp.get(index); if (!Event.ENDEVENT.equals(seqTmp.get(seqTmp.size() - 1))) { - List> sequence; + List sequence; if (validEnd) { sequence = finishSequence(seqTmp, model, length + 2, @@ -180,19 +180,19 @@ * @return finished sequence of the desired length */ - private List> finishSequence( - List> sequence, IStochasticProcess model, + private List finishSequence( + List sequence, IStochasticProcess model, int length, boolean validEnd) { Random r = new Random(); boolean endFound = false; - List> sequenceCopy = new LinkedList>(sequence); + List sequenceCopy = new LinkedList(sequence); final int maxIter = 30000; int iter = 0; while (!endFound && iter < maxIter) { iter++; - sequenceCopy = new LinkedList>(sequence); + sequenceCopy = new LinkedList(sequence); while (!endFound && sequenceCopy.size() <= length) { double randVal = r.nextDouble(); double probSum = 0.0; - for (Event symbol : model.getEvents()) { + for (Event symbol : model.getEvents()) { probSum += model.getProbability(sequenceCopy, symbol); if (probSum >= randVal) { Index: /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java =================================================================== --- /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java (revision 546) +++ /trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java (revision 547) @@ -138,6 +138,5 @@ * @return the test suite */ - @SuppressWarnings("unchecked") - public Collection>> generateTestSuite( + public Collection> generateTestSuite( IStochasticProcess model) { if (model == null) { @@ -145,15 +144,15 @@ } - Set>> sequences = new HashSet>>( + Set> sequences = new HashSet>( numSequences); actualIter = 0; while (sequences.size() < numSequences && actualIter < maxIter) { - List> generatedSequence = model.randomSequence( + List generatedSequence = model.randomSequence( maxLength, validEnd); if (generatedSequence.size() >= minLength && generatedSequence.size() <= maxLength) { - ((List>) generatedSequence).add(0, Event.STARTEVENT); + ((List) generatedSequence).add(0, Event.STARTEVENT); if (validEnd) { - ((List>) generatedSequence).add(Event.ENDEVENT); + ((List) generatedSequence).add(Event.ENDEVENT); } sequences.add(generatedSequence); Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/DeterministicFiniteAutomaton.java (revision 547) @@ -51,6 +51,6 @@ */ @Override - public double getProbability(List> context, - Event symbol) { + public double getProbability(List context, + Event symbol) { if( context==null ) { throw new InvalidParameterException("context must not be null"); @@ -61,13 +61,13 @@ double result = 0.0d; - List> contextCopy; + List contextCopy; if (context.size() >= trieOrder) { - contextCopy = new LinkedList>(context.subList( + contextCopy = new LinkedList(context.subList( context.size() - trieOrder + 1, context.size())); } else { - contextCopy = new LinkedList>(context); + contextCopy = new LinkedList(context); } - Collection> followers = trie.getFollowingSymbols(contextCopy); + Collection followers = trie.getFollowingSymbols(contextCopy); if (followers.size() != 0 && followers.contains(symbol)) { Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/FirstOrderMarkovModel.java (revision 547) @@ -67,5 +67,5 @@ */ private Matrix getTransmissionMatrix() { - List> knownSymbols = new ArrayList>( + List knownSymbols = new ArrayList( trie.getKnownSymbols()); int numStates = knownSymbols.size(); @@ -73,9 +73,9 @@ for (int i = 0; i < numStates; i++) { - Event currentSymbol = knownSymbols.get(i); - List> context = new ArrayList>(); + Event currentSymbol = knownSymbols.get(i); + List context = new ArrayList(); context.add(currentSymbol); for (int j = 0; j < numStates; j++) { - Event follower = knownSymbols.get(j); + Event follower = knownSymbols.get(j); double prob = getProbability(context, follower); transmissionMatrix.set(i, j, prob); @@ -96,5 +96,5 @@ public double calcEntropy() { Matrix transmissionMatrix = getTransmissionMatrix(); - List> knownSymbols = new ArrayList>( + List knownSymbols = new ArrayList( trie.getKnownSymbols()); int numStates = knownSymbols.size(); @@ -173,15 +173,15 @@ stringBuilder.append("digraph model {" + StringTools.ENDLINE); - List> knownSymbols = new ArrayList>( - trie.getKnownSymbols()); - for (Event symbol : knownSymbols) { + List knownSymbols = new ArrayList( + trie.getKnownSymbols()); + for (Event symbol : knownSymbols) { final String thisSaneId = symbol.getShortId().replace("\"", "\\\"") .replaceAll("[\r\n]", ""); stringBuilder.append(" " + knownSymbols.indexOf(symbol) + " [label=\"" + thisSaneId + "\"];" + StringTools.ENDLINE); - List> context = new ArrayList>(); + List context = new ArrayList(); context.add(symbol); - Collection> followers = trie.getFollowingSymbols(context); - for (Event follower : followers) { + Collection followers = trie.getFollowingSymbols(context); + for (Event follower : followers) { stringBuilder.append(" " + knownSymbols.indexOf(symbol) + " -> " + knownSymbols.indexOf(follower) + " "); @@ -206,15 +206,15 @@ Graph graph = new SparseMultigraph(); - List> knownSymbols = new ArrayList>( - trie.getKnownSymbols()); - - for (Event symbol : knownSymbols) { + List knownSymbols = new ArrayList( + trie.getKnownSymbols()); + + for (Event symbol : knownSymbols) { String from = symbol.getShortId(); - List> context = new ArrayList>(); + List context = new ArrayList(); context.add(symbol); - Collection> followers = trie.getFollowingSymbols(context); - - for (Event follower : followers) { + Collection followers = trie.getFollowingSymbols(context); + + for (Event follower : followers) { String to = follower.getShortId(); MarkovEdge prob = new MarkovEdge(getProbability(context, Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/HighOrderMarkovModel.java (revision 547) @@ -53,6 +53,6 @@ */ @Override - public double getProbability(List> context, - Event symbol) { + public double getProbability(List context, + Event symbol) { if (context == null) { throw new InvalidParameterException("context must not be null"); @@ -63,15 +63,15 @@ double result = 0.0d; - List> contextCopy; + List contextCopy; if (context.size() >= trieOrder) { - contextCopy = new LinkedList>(context.subList( + contextCopy = new LinkedList(context.subList( context.size() - trieOrder + 1, context.size())); } else { - contextCopy = new LinkedList>(context); + contextCopy = new LinkedList(context); } - Collection> followers = trie.getFollowingSymbols(contextCopy); + Collection followers = trie.getFollowingSymbols(contextCopy); int sumCountFollowers = 0; // N(s\sigma') - for (Event follower : followers) { + for (Event follower : followers) { sumCountFollowers += trie.getCount(contextCopy, follower); } Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/IStochasticProcess.java (revision 547) @@ -34,5 +34,5 @@ * thrown if context or symbol is null */ - double getProbability(List> context, Event symbol); + double getProbability(List context, Event symbol); /** @@ -48,5 +48,5 @@ * thrown if sequence is null */ - double getProbability(List> sequence); + double getProbability(List sequence); /** @@ -58,5 +58,5 @@ * @return randomly generated sequence */ - public List> randomSequence(); + public List randomSequence(); /** @@ -81,5 +81,5 @@ * */ - public List> randomSequence(int maxLength, + public List randomSequence(int maxLength, boolean validEnd); @@ -98,5 +98,5 @@ * thrown if length is less than or equal to 0 */ - public Collection>> generateSequences(int length); + public Collection> generateSequences(int length); /** @@ -118,5 +118,5 @@ * thrown if length is less than or equal to 0 */ - public Collection>> generateSequences(int length, + public Collection> generateSequences(int length, boolean fromStart); @@ -135,5 +135,5 @@ * thrown if length is less than or equal to 0 */ - public Collection>> generateValidSequences( + public Collection> generateValidSequences( int length); @@ -190,5 +190,5 @@ * @return events known by the process */ - public Collection> getEvents(); + public Collection getEvents(); } Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java (revision 547) @@ -27,5 +27,5 @@ private static final String EVENT_SEPARATOR = "-=-"; - Trie> firstOrderTrie; + Trie firstOrderTrie; /** @@ -47,9 +47,9 @@ firstOrderModel.trieOrder = 2; if (markovOrder == 1) { - firstOrderModel.trie = new Trie>(model.trie); + firstOrderModel.trie = new Trie(model.trie); firstOrderModel.trieOrder = 2; } else { - firstOrderTrie = new Trie>(); - TrieNode> rootNode = model.trie.find(null); + firstOrderTrie = new Trie(); + TrieNode rootNode = model.trie.find(null); generateFirstOrderTrie(rootNode, new LinkedList(), markovOrder); firstOrderTrie.updateKnownSymbols(); @@ -98,7 +98,7 @@ * depth to go - NOT the current depth. */ - private void generateFirstOrderTrie(TrieNode> currentNode, + private void generateFirstOrderTrie(TrieNode currentNode, List parentIDs, int depth) { - for (TrieNode> child : currentNode.getChildren()) { + for (TrieNode child : currentNode.getChildren()) { String currentId = child.getSymbol().getStandardId(); if (depth > 1) { @@ -113,9 +113,9 @@ } firstOrderID.append(currentId); - TrieNode> firstOrderNode = firstOrderTrie + TrieNode firstOrderNode = firstOrderTrie .getChildCreate(new Event(firstOrderID .toString())); firstOrderNode.setCount(child.getCount()); - for (TrieNode> transitionChild : child.getChildren()) { + for (TrieNode transitionChild : child.getChildren()) { StringBuilder transitionID = new StringBuilder(); for (String parentID : parentIDs.subList(1, @@ -126,5 +126,5 @@ transitionID.append(transitionChild.getSymbol() .getStandardId()); - TrieNode> firstOrderTransitionChild = firstOrderNode + TrieNode firstOrderTransitionChild = firstOrderNode .getChildCreate(new Event(transitionID .toString())); Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/PredictionByPartialMatch.java (revision 547) @@ -149,6 +149,6 @@ */ @Override - public double getProbability(List> context, - Event symbol) { + public double getProbability(List context, + Event symbol) { if (context == null) { throw new InvalidParameterException("context must not be null"); @@ -161,15 +161,15 @@ double resultShorterContex = 0.0d; - List> contextCopy; + List contextCopy; if (context.size() >= trieOrder) { - contextCopy = new LinkedList>(context.subList( + contextCopy = new LinkedList(context.subList( context.size() - trieOrder + 1, context.size())); } else { - contextCopy = new LinkedList>(context); - } - - Collection> followers = trie.getFollowingSymbols(contextCopy); // \Sigma' + contextCopy = new LinkedList(context); + } + + Collection followers = trie.getFollowingSymbols(contextCopy); // \Sigma' int sumCountFollowers = 0; // N(s\sigma') - for (Event follower : followers) { + for (Event follower : followers) { sumCountFollowers += trie.getCount(contextCopy, follower); } Index: /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java =================================================================== --- /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java (revision 546) +++ /trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/TrieBasedModel.java (revision 547) @@ -49,5 +49,5 @@ *

*/ - protected Trie> trie = null; + protected Trie trie = null; /** @@ -101,5 +101,5 @@ * thrown is sequences is null */ - public void train(Collection>> sequences) { + public void train(Collection> sequences) { trie = null; update(sequences); @@ -119,13 +119,13 @@ * thrown is sequences is null */ - public void update(Collection>> sequences) { + public void update(Collection> sequences) { if (sequences == null) { throw new InvalidParameterException("sequences must not be null"); } if (trie == null) { - trie = new Trie>(); - } - for (List> sequence : sequences) { - List> currentSequence = new LinkedList>(sequence); // defensive + trie = new Trie(); + } + for (List sequence : sequences) { + List currentSequence = new LinkedList(sequence); // defensive // copy currentSequence.add(0, Event.STARTEVENT); @@ -142,5 +142,5 @@ */ @Override - public List> randomSequence() { + public List randomSequence() { return randomSequence(Integer.MAX_VALUE, true); } @@ -152,12 +152,12 @@ */ @Override - public List> randomSequence(int maxLength, + public List randomSequence(int maxLength, boolean validEnd) { - List> sequence = new LinkedList>(); + List sequence = new LinkedList(); if (trie != null) { boolean endFound = false; while (!endFound) { // outer loop for length checking - sequence = new LinkedList>(); - IncompleteMemory> context = new IncompleteMemory>( + sequence = new LinkedList(); + IncompleteMemory context = new IncompleteMemory( trieOrder - 1); context.add(Event.STARTEVENT); @@ -166,6 +166,6 @@ double randVal = r.nextDouble(); double probSum = 0.0; - List> currentContext = context.getLast(trieOrder); - for (Event symbol : trie.getKnownSymbols()) { + List currentContext = context.getLast(trieOrder); + for (Event symbol : trie.getKnownSymbols()) { probSum += getProbability(currentContext, symbol); if (probSum >= randVal) { @@ -262,5 +262,5 @@ String[] stateStrings = new String[getNumSymbols()]; int i = 0; - for (Event symbol : trie.getKnownSymbols()) { + for (Event symbol : trie.getKnownSymbols()) { if (symbol.toString() == null) { stateStrings[i] = "null"; @@ -279,7 +279,7 @@ */ @Override - public Collection> getEvents() { - if (trie == null) { - return new HashSet>(); + public Collection getEvents() { + if (trie == null) { + return new HashSet(); } else { return trie.getKnownSymbols(); @@ -294,5 +294,5 @@ */ @Override - public Collection>> generateSequences(int length) { + public Collection> generateSequences(int length) { return generateSequences(length, false); } @@ -306,7 +306,7 @@ */ @Override - public Set>> generateSequences(int length, + public Set> generateSequences(int length, boolean fromStart) { - Set>> sequenceSet = new LinkedHashSet>>(); + Set> sequenceSet = new LinkedHashSet>(); if (length < 1) { throw new InvalidParameterException( @@ -315,10 +315,10 @@ if (length == 1) { if (fromStart) { - List> subSeq = new LinkedList>(); + List subSeq = new LinkedList(); subSeq.add(Event.STARTEVENT); sequenceSet.add(subSeq); } else { - for (Event event : getEvents()) { - List> subSeq = new LinkedList>(); + for (Event event : getEvents()) { + List subSeq = new LinkedList(); subSeq.add(event); sequenceSet.add(subSeq); @@ -327,12 +327,12 @@ return sequenceSet; } - Collection> events = getEvents(); - Collection>> seqsShorter = generateSequences( + Collection events = getEvents(); + Collection> seqsShorter = generateSequences( length - 1, fromStart); - for (Event event : events) { - for (List> seqShorter : seqsShorter) { - Event lastEvent = event; + for (Event event : events) { + for (List seqShorter : seqsShorter) { + Event lastEvent = event; if (getProbability(seqShorter, lastEvent) > 0.0) { - List> subSeq = new ArrayList>(seqShorter); + List subSeq = new ArrayList(seqShorter); subSeq.add(lastEvent); sequenceSet.add(subSeq); @@ -351,11 +351,11 @@ */ @Override - public Collection>> generateValidSequences( + public Collection> generateValidSequences( int length) { // check for min-length implicitly done by generateSequences - Collection>> allSequences = generateSequences( + Collection> allSequences = generateSequences( length, true); - Collection>> validSequences = new LinkedHashSet>>(); - for (List> sequence : allSequences) { + Collection> validSequences = new LinkedHashSet>(); + for (List sequence : allSequences) { if (sequence.size() == length && Event.ENDEVENT.equals(sequence.get(sequence.size() - 1))) { @@ -374,11 +374,11 @@ */ @Override - public double getProbability(List> sequence) { + public double getProbability(List sequence) { if (sequence == null) { throw new InvalidParameterException("sequence must not be null"); } double prob = 1.0; - List> context = new LinkedList>(); - for (Event event : sequence) { + List context = new LinkedList(); + for (Event event : sequence) { prob *= getProbability(context, event); context.add(event); Index: /trunk/quest-runner/.classpath =================================================================== --- /trunk/quest-runner/.classpath (revision 546) +++ /trunk/quest-runner/.classpath (revision 547) @@ -2,4 +2,10 @@ + + + + + + Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ReplayGenerator.java (revision 547) @@ -9,6 +9,6 @@ import de.ugoe.cs.quest.IReplayDecorator; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.eventcore.IReplayable; -import de.ugoe.cs.quest.eventcore.ReplayableEvent; import de.ugoe.cs.util.StringTools; import de.ugoe.cs.util.console.Console; @@ -19,4 +19,7 @@ * if {@link ReplayableEvent}s. *

+ * + * TODO: Figure our how to handle {@link IReplayDecorator} + * TODO: Add appropriate checks if Events are replayable * * @author Steffen Herbold @@ -52,5 +55,5 @@ */ public void createLogfileMultipleSessions( - Collection>> sequences, String filename) { + Collection> sequences, String filename) { OutputStreamWriter writer = openReplayFile(filename); if (writer != null) { @@ -60,5 +63,5 @@ writer.write(decorator.getHeader()); } - for (List> actions : sequences) { + for (List actions : sequences) { writeSession(actions, writer); } @@ -84,5 +87,5 @@ * name and path of the replay file */ - public void createLogfileSingleSession(List> actions, + public void createLogfileSingleSession(List actions, String filename) { OutputStreamWriter writer = openReplayFile(filename); @@ -152,10 +155,10 @@ * thrown if there is a problem writing to writer */ - private void writeSession(List> actions, + private void writeSession(List actions, OutputStreamWriter writer) throws IOException { if (decorator != null) { writer.write(decorator.getSessionHeader(sessionId)); } - for (ReplayableEvent currentAction : actions) { + for (Event currentAction : actions) { List replayables = currentAction Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/AbstractTrainCommand.java (revision 547) @@ -81,5 +81,5 @@ return; } - Collection>> sequences = (Collection>>) dataObject; + Collection> sequences = (Collection>) dataObject; TrieBasedModel model = createModel(); Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDcalcCoverage.java (revision 547) @@ -49,6 +49,6 @@ IStochasticProcess process = null; - Collection>> observedSequences = null; - Collection>> sequences = null; + Collection> observedSequences = null; + Collection> sequences = null; Object dataObjectProcess = GlobalDataContainer.getInstance().getData( modelname); @@ -73,5 +73,5 @@ } process = (IStochasticProcess) dataObjectProcess; - observedSequences = (Collection>>) dataObjectObserved; + observedSequences = (Collection>) dataObjectObserved; Console.print("seqName"); @@ -103,5 +103,5 @@ return; } - sequences = (Collection>>) dataObjectSequences; + sequences = (Collection>) dataObjectSequences; Console.print(sequenceName); for (int length = minLength; length <= maxLength; length++) { Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.java (revision 547) @@ -68,5 +68,5 @@ DrawFromAllSequencesGenerator generator = new DrawFromAllSequencesGenerator( numSequences, minLength, maxLength, validEnd, all); - Collection>> sequences = generator + Collection> sequences = generator .generateTestSuite(model); Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateGreedy.java (revision 547) @@ -78,5 +78,5 @@ // set up everything - List>> allSequences = new LinkedList>>(); + List> allSequences = new LinkedList>(); for (int length = minLength; length <= maxLength; length++) { if (validEnd) { @@ -88,20 +88,20 @@ Console.traceln("" + allSequences.size() + " possible"); - Collection>> allSubSeqs = model + Collection> allSubSeqs = model .generateSequences(coverageDepth); - Map>, Double> weightMap = SequenceTools + Map, Double> weightMap = SequenceTools .generateWeights(model, allSubSeqs); - Set>> coveredSubSeqs = new LinkedHashSet>>(); + Set> coveredSubSeqs = new LinkedHashSet>(); - List>>> containedSubSeqs = new LinkedList>>>(); - for (List> sequence : allSequences) { - List>> wrapper = new LinkedList>>(); + List>> containedSubSeqs = new LinkedList>>(); + for (List sequence : allSequences) { + List> wrapper = new LinkedList>(); wrapper.add(sequence); - Set>> currentSubSeqs = SequenceTools + Set> currentSubSeqs = SequenceTools .containedSubSequences(wrapper, coverageDepth); containedSubSeqs.add(currentSubSeqs); } - List>> testSuite = new LinkedList>>(); + List> testSuite = new LinkedList>(); double currentCoverage = 0.0d; @@ -112,10 +112,10 @@ Double[] sequenceGain = new Double[allSequences.size()]; int i = 0; - for (Set>> containedSubSeq : containedSubSeqs) { + for (Set> containedSubSeq : containedSubSeqs) { double gain = 0.0d; - Iterator>> subSeqIter = containedSubSeq + Iterator> subSeqIter = containedSubSeq .iterator(); while (subSeqIter.hasNext()) { - List> subSeq = subSeqIter.next(); + List subSeq = subSeqIter.next(); if (!coveredSubSeqs.contains(subSeq)) { gain += weightMap.get(subSeq); Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateHybrid.java (revision 547) @@ -78,5 +78,5 @@ HybridGenerator generator = new HybridGenerator(numSequences, length, maxLengthAll, validEnd); - Collection>> sequences = generator.generateTestSuite(model); + Collection> sequences = generator.generateTestSuite(model); if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) { Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomReplay.java (revision 547) @@ -8,5 +8,5 @@ import de.ugoe.cs.quest.CommandHelpers; import de.ugoe.cs.quest.ReplayGenerator; -import de.ugoe.cs.quest.eventcore.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.ui.GlobalDataContainer; import de.ugoe.cs.quest.usageprofiles.IStochasticProcess; @@ -67,9 +67,9 @@ } model = (IStochasticProcess) dataObject; - Collection>> sequences = new LinkedList>>(); + Collection> sequences = new LinkedList>(); try { for (int i = 0; i < numSessions; i++) { sequences - .add((List>) model.randomSequence()); + .add((List) model.randomSequence()); } } catch (ClassCastException e) { Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java (revision 547) @@ -69,5 +69,5 @@ RandomWalkGenerator generator = new RandomWalkGenerator(numSessions, minLength, maxLength, validEnd, maxIter); - Collection>> sequences = generator + Collection> sequences = generator .generateTestSuite(model); Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateReplayfile.java (revision 547) @@ -8,5 +8,5 @@ import de.ugoe.cs.quest.ReplayGenerator; import de.ugoe.cs.quest.SequenceInstanceOf; -import de.ugoe.cs.quest.eventcore.ReplayableEvent; +import de.ugoe.cs.quest.eventcore.Event; import de.ugoe.cs.quest.ui.GlobalDataContainer; import de.ugoe.cs.util.console.Command; @@ -50,5 +50,5 @@ } - Collection>> sequences = null; + Collection> sequences = null; Object dataObject = GlobalDataContainer.getInstance().getData( sequencesName); @@ -63,5 +63,5 @@ } - sequences = (Collection>>) dataObject; + sequences = (Collection>) dataObject; ReplayGenerator generator = new ReplayGenerator(); generator.createLogfileMultipleSessions(sequences, filename); Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDsequenceStatistics.java (revision 547) @@ -41,5 +41,5 @@ } - Collection>> sequences = null; + Collection> sequences = null; Object dataObject = GlobalDataContainer.getInstance().getData( sequencesName); @@ -54,8 +54,8 @@ } - sequences = (Collection>>) dataObject; + sequences = (Collection>) dataObject; Console.println("Number of Sequences: " + sequences.size()); SortedMap lengthMap = new TreeMap(); - for (List> sequence : sequences) { + for (List sequence : sequences) { Integer currentSize = sequence.size(); if (lengthMap.containsKey(currentSize)) { Index: /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java =================================================================== --- /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java (revision 546) +++ /trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDupdateModel.java (revision 547) @@ -52,5 +52,5 @@ return; } - Collection>> sequences = (Collection>>) dataObject; + Collection> sequences = (Collection>) dataObject; dataObject = GlobalDataContainer.getInstance().getData(modelname);