Skip to content

Commit

Permalink
cumulative updates, including Valmari's minimization algorithm
Browse files Browse the repository at this point in the history
  • Loading branch information
amoeller committed Jul 4, 2017
1 parent 53c86cd commit d646e15
Show file tree
Hide file tree
Showing 30 changed files with 576 additions and 98 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/build
/antbuild
/target
/dist
/doc
/.idea/workspace.xml
/.idea/kotlinc.xml
*.iml
6 changes: 6 additions & 0 deletions .idea/ant.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/dk.brics.automaton.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2001-2011 Anders Moeller
Copyright (c) 2001-2017 Anders Moeller
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
11 changes: 10 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
1.11-8 -> 1.12-1
================
- added Valmari's minimization algorithm - contributed by S. Gregersen
- now supports Maven - thanks to S. Gregersen
- fixed missing check of 'minimize' option - thanks to V. Wuestholz
- fixed state naming for singleton automata - thanks to A.M.W. Younang and S. Gregersen
- RunAutomaton.setAlphabet now non-final - suggested by D. Lowe
- minor simplification of 'determinize' - suggested by V. Berchet

1.11-7 -> 1.11-8
================
- caching of isDebug, to avoid synchronized call to System.getProperty - thanks to G. Lundh
Expand All @@ -24,7 +33,7 @@
a minimal automaton that accepts a union of strings) - contributed by D. Weiss
- added call to clearHashCode in Automaton.reduce - thanks to D. Weiss
- minimization is now optional in RegExp.toAutomaton - suggested by H. Zauner
- SpecialOperations.reverse made public - suggested by Daniel Lowe
- SpecialOperations.reverse made public - suggested by D. Lowe

1.11-1 -> 1.11-2
================
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dk.brics.automaton
------------------

Copyright (C) 2001-2011 Anders Moeller
Copyright (C) 2001-2017 Anders Moeller

This source code in this package may be used under the terms of the
BSD license. Please read the file 'COPYING' for details.
Expand Down
23 changes: 12 additions & 11 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<project name="dk.brics.automaton" default="all" basedir=".">

<property name="project" value="automaton" />
<property name="version" value="1.11" />
<property name="release" value="8" />
<property name="version" value="1.12" />
<property name="release" value="1" />

<property name="optimize" value="on" />
<property name="debug" value="off" />
Expand All @@ -14,30 +14,30 @@
<target name="all" depends="jar,doc" />

<target name="compile">
<mkdir dir="build" />
<javac srcdir="src" destdir="build" source="1.5" target="1.5" optimize="${optimize}" debug="${debug}" />
<mkdir dir="antbuild" />
<javac srcdir="src" destdir="antbuild" source="1.6" target="1.6" optimize="${optimize}" debug="${debug}" includeantruntime="false" />
</target>

<target name="jar" depends="compile,datatypes">
<mkdir dir="dist" />
<jar jarfile="dist/${project}.jar" basedir="build" includes="dk/**/*.class,*.aut" />
<jar jarfile="dist/${project}.jar" basedir="antbuild" includes="dk/**/*.class,*.aut" />
</target>

<target name="clean">
<delete dir="build" />
<delete dir="antbuild" />
<delete dir="doc" />
<delete dir="dist" />
</target>

<dependset>
<srcfilelist dir="src/dk/brics/automaton" files="Datatypes.java"/>
<srcfilelist dir="src" files="Unicode.txt"/>
<targetfileset dir="build" includes="*.aut"/>
<targetfileset dir="antbuild" includes="*.aut"/>
</dependset>

<target name="datatypes" depends="compile">
<java classname="dk.brics.automaton.Datatypes" classpath="build">
<sysproperty key="dk.brics.automaton.datatypes" value="build"/>
<java classname="dk.brics.automaton.Datatypes" classpath="antbuild">
<sysproperty key="dk.brics.automaton.datatypes" value="antbuild"/>
</java>
</target>

Expand Down Expand Up @@ -71,9 +71,10 @@
author="true"
notree="true"
nohelp="true"
windowtitle="dk.brics.automaton">
windowtitle="dk.brics.automaton"
additionalparam="-Xdoclint:none">
<doctitle><![CDATA[dk.brics.automaton<br>API Specification]]></doctitle>
<bottom><![CDATA[<i> Copyright &#169; 2001-2011 Anders M&oslash;ller. </i>]]></bottom>
<bottom><![CDATA[<i> Copyright &#169; 2001-2017 Anders M&oslash;ller. </i>]]></bottom>
<link href="http://download.oracle.com/javase/1.5.0/docs/api/" />
</javadoc>
</target>
Expand Down
143 changes: 143 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>dk.brics</groupId>
<artifactId>automaton</artifactId>
<version>1.12-1</version>
<packaging>jar</packaging>

<name>dk.brics.automaton</name>
<description>
This package contains a full DFA/NFA implementation with Unicode
alphabet and support for all standard regular expression operations.
</description>
<url>http://www.brics.dk/automaton</url>

<licenses>
<license>
<name>BSD</name>
<url>http://www.opensource.org/licenses/bsd-license.php</url>
</license>
</licenses>

<developers>
<developer>
<id>amoeller</id>
<name>Anders Møller</name>
<email>amoeller@cs.au.dk</email>
<url>http://cs.au.dk/~amoeller</url>
<organization>Aarhus University</organization>
</developer>
</developers>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<scm>
<connection>scm:git:git://github.com/cs-au-dk/dk.brics.automaton.git</connection>
<developerConnection>scm:git:ssh://github.com:cs-au-dk/dk.brics.automaton.git</developerConnection>
<url>https://github.com/cs-au-dk/dk.brics.automaton</url>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<sourceDirectory>src</sourceDirectory>
<outputDirectory>build</outputDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<mainClass>dk.brics.automaton.Datatypes</mainClass>
<systemProperties>
<systemProperty>
<key>dk.brics.automaton.datatypes</key>
<value>build</value>
</systemProperty>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit d646e15

Please sign in to comment.