Introduced standard maven project source folder structure

Author: johspaeth

pom.xml

@@ -1,34 +1,38 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>de.fraunhofer.iem</groupId>
-  <artifactId>PathExpression</artifactId>
-  <version>1.0.0</version>
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>de.fraunhofer.iem</groupId>
+	<artifactId>PathExpression</artifactId>
+	<version>1.0.0</version>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
 		<dependency>
-		    <groupId>com.google.guava</groupId>
-		    <artifactId>guava</artifactId>
-		    <version>23.5-jre</version>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>23.5-jre</version>
 		</dependency>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.12</version>
-          <scope>test</scope>
-      </dependency>
-  </dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+	</dependencies>
 </project>

src/pathexpression/Edge.java renamed to src/main/java/pathexpression/Edge.java

@@ -18,15 +18,24 @@
 import com.google.common.collect.Table;
 import pathexpression.RegEx.EmptySet;
 
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class PathExpressionComputer<N, V> {
 
+  final static Logger logger = LogManager.getLogger(PathExpressionComputer.class);
+
   private LabeledGraph<N, V> graph;
   private BiMap<N, Integer> nodeToIntMap = HashBiMap.create();
   private Table<Integer, Integer, IRegEx<V>> table = HashBasedTable.create();
   private IRegEx<V> emptyRegEx = new RegEx.EmptySet<V>();
+  private Map<N,List<IRegEx<V>>> allPathFromNode = new HashMap<>();
+  private boolean eliminated;
 
   public PathExpressionComputer(LabeledGraph<N, V> graph) {
     this.graph = graph;
@@ -56,7 +65,12 @@ public IRegEx<V> getExpressionBetween(N a, N b) {
 
   private List<IRegEx<V>> computeAllPathFrom(N a) {
     assert graph.getNodes().contains(a);
+    if(allPathFromNode.get(a) != null) {
+    		return allPathFromNode.get(a);
+    }
+    
     eliminate();
+    logger.debug("Compute all path from {}", a);
     List<PathExpression<V>> extractPathSequence = extractPathSequence();
     List<IRegEx<V>> regEx = new LinkedList<>();
     for (int i = 0; i < graph.getNodes().size(); i++) {
@@ -84,10 +98,14 @@ private List<IRegEx<V>> computeAllPathFrom(N a) {
         regEx.set(wi - 1, RegEx.<V>union(regExWi, inter));
       }
     }
+    allPathFromNode.put(a, regEx);
+    logger.debug("End extraction all path");
     return regEx;
   }
 
   private List<PathExpression<V>> extractPathSequence() {
+
+	
     int n = graph.getNodes().size();
     List<PathExpression<V>> list = new LinkedList<PathExpression<V>>();
     for (int u = 1; u <= n; u++) {
@@ -110,6 +128,10 @@ private List<PathExpression<V>> extractPathSequence() {
   }
 
   private void eliminate() {
+	if(eliminated) {
+	  return;
+	}
+	logger.debug("Start eliminating");
     int numberOfNodes = graph.getNodes().size();
     for (int v = 1; v <= numberOfNodes; v++) {
       for (int w = 1; w <= numberOfNodes; w++) {
@@ -151,6 +173,8 @@ private void eliminate() {
         }
       }
     }
+    eliminated = true;
+    logger.debug("End eliminating");
   }
 
 

src/pathexpression/Epsilon.java renamed to src/main/java/pathexpression/Epsilon.java

@@ -194,6 +194,25 @@ public static <V> IRegEx<V> concatenate(IRegEx<V> a, IRegEx<V> b) {
     return simplify(new Concatenate<V>(a, b));
   }
 
+  public static <V> IRegEx<V> reverse(IRegEx<V> a) {
+    assert a != null;
+    if(a instanceof EmptySet || a instanceof Epsilon || a instanceof Plain)
+    		return a;
+    if(a instanceof Concatenate) {
+    		Concatenate concatenate = (Concatenate) a;
+		return concatenate(reverse(concatenate.getSecond()), reverse(concatenate.getFirst()));
+    }
+    if(a instanceof Union) {
+    		Union union = (Union) a;
+    		return union(reverse(union.getFirst()), reverse(union.getSecond()));
+    }
+    if(a instanceof Star) {
+    		Star star = (Star) a;
+		return star(reverse(star.getPlain()));
+    }
+    throw new IllegalStateException("Cannot reverse this regular expression: " + a);
+  }
+
   public static <V> boolean containsEpsilon(IRegEx<V> regex) {
     if (regex instanceof Union) {
       Union con = (Union) regex;
@@ -301,4 +320,5 @@ public boolean equals(Object obj) {
 
 
 
+
 }

src/pathexpression/IRegEx.java renamed to src/main/java/pathexpression/IRegEx.java

@@ -0,0 +1,16 @@
+# Root logger option
+log4j.rootLogger=DEBUG, stdout, file
+
+# Redirect log messages to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Redirect log messages to a log file, support file rolling.
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=C:\\log4j-application.log
+log4j.appender.file.MaxFileSize=5MB
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n