Restructured subpackages

src/main/java/de/tuebingen/sfs/jfst/Alphabet.java → src/main/java/de/tuebingen/sfs/jfst/alphabet/Alphabet.java

@@ -1,4 +1,4 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.alphabet;
 
 import java.util.*;
 
@@ -20,23 +20,23 @@ public class Alphabet {
     /**
      * Create an empty Alphabet.
      */
-    Alphabet() {
+    public Alphabet() {
         alphabet = new ArrayList<>();
         id2sym = new ArrayList<>();
     }
 
     /**
      * Create an Alphabet with symbols.
      */
-    Alphabet(String[] symbols) {
+    public Alphabet(String[] symbols) {
         this();
         addSymbols(symbols);
     }
 
     /**
      * Create an Alphabet with symbols.
      */
-    Alphabet(Iterable<String> symbols) {
+    public Alphabet(Iterable<String> symbols) {
         this();
         addSymbols(symbols);
     }
@@ -46,7 +46,7 @@ public class Alphabet {
      * @param symbol A char symbol
      * @return True if this Alphabet already contains the symbol
      */
-    boolean contains(char symbol) {
+    public boolean contains(char symbol) {
         return Collections.binarySearch(alphabet, symbol) >= 0;
     }
 
@@ -55,7 +55,7 @@ boolean contains(char symbol) {
      * @param symbol A string symbol
      * @return True if this Alphabet already contains the symbol
      */
-    boolean contains(String symbol) {
+    public boolean contains(String symbol) {
         return Collections.binarySearch(alphabet, symbol) >= 0;
     }
 
@@ -65,7 +65,7 @@ boolean contains(String symbol) {
      * @param symbol A string symbol
      * @return The Symbol object associated with this string
      */
-    Symbol getSymbol(String symbol) {
+    public Symbol getSymbol(String symbol) {
         int i = Collections.binarySearch(alphabet, symbol);
         if (i < 0) {
             i = -(i+1);
@@ -80,14 +80,14 @@ Symbol getSymbol(String symbol) {
      * @param id An id
      * @return The symbol with this id or null if there is no such symbol
      */
-    Symbol getSymbol(int id) {
+    public Symbol getSymbol(int id) {
         if (id < id2sym.size())
             return id2sym.get(id);
         else
             return null;
     }
 
-    void setSymbol(int id, String symbol) {
+    private void setSymbol(int id, String symbol) {
         if (id >= id2sym.size())
             addSymbol(symbol);
         else {
@@ -99,7 +99,7 @@ void setSymbol(int id, String symbol) {
         }
     }
 
-    List<Symbol> getPrefixes(String s, int start) {
+    public List<Symbol> getPrefixes(String s, int start) {
         List<Symbol> prefixes = new ArrayList<>();
         char c = s.charAt(start);
 //        int i = Collections.binarySearch(alphabet, c);
@@ -121,15 +121,15 @@ List<Symbol> getPrefixes(String s, int start) {
      * Add a symbol to the alphabet. Calls getSymbol() internally.
      * @param symbol A symbol
      */
-    void addSymbol(String symbol) {
+    public void addSymbol(String symbol) {
         getSymbol(symbol);
     }
 
     /**
      * Add multiple symbols to the alphabet. Calls getSymbol() internally.
      * @param symbols An array of symbols
      */
-    void addSymbols(String[] symbols) {
+    public void addSymbols(String[] symbols) {
         int i = 0;
         for (String sym : symbols) {
             if (sym == null)
@@ -143,7 +143,7 @@ void addSymbols(String[] symbols) {
      * Add multiple symbols to the alphabet. Calls getSymbol() internally.
      * @param symbols A list of symbols
      */
-    void addSymbols(Iterable<String> symbols) {
+    public void addSymbols(Iterable<String> symbols) {
         for (String sym : symbols) {
             if (sym == null)
                 addSymbol("NULL");
@@ -174,7 +174,7 @@ private Symbol createSymbol(String symbol, int id) {
      * Get the string representations of all symbols in this alphabet as an array, ordered according to their id.
      * @return An array with all symols in this alphabet
      */
-    String[] getSymbols() {
+    public String[] getSymbols() {
         return id2sym.stream().map(Symbol::asString).toArray(String[]::new);
     }
 
@@ -183,15 +183,15 @@ String[] getSymbols() {
      * @param symbol A string symbol
      * @return The id of the symbol in this alphabet, or -1 if it is not contained
      */
-    int idOf(String symbol) {
+    public int idOf(String symbol) {
         return (contains(symbol)) ? getSymbol(symbol).getId() : -1;
     }
 
     /**
      * Get the total number of symbols in this alphabet.
      * @return The size of this alphabet
      */
-    int size() {
+    public int size() {
         return alphabet.size();
     }
 

src/main/java/de/tuebingen/sfs/jfst/CharSymbol.java → src/main/java/de/tuebingen/sfs/jfst/alphabet/CharSymbol.java

@@ -1,4 +1,4 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.alphabet;
 
 /**
  * A symbol consisting of a single character.

src/main/java/de/tuebingen/sfs/jfst/MulticharSymbol.java → src/main/java/de/tuebingen/sfs/jfst/alphabet/MulticharSymbol.java

@@ -1,4 +1,4 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.alphabet;
 
 /**
  * A symbol consisting of multiple characters.

src/main/java/de/tuebingen/sfs/jfst/Symbol.java → src/main/java/de/tuebingen/sfs/jfst/alphabet/Symbol.java

@@ -1,4 +1,4 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.alphabet;
 
 /**
  * A symbol in the alphabet of an FST.

src/main/java/de/tuebingen/sfs/jfst/CompactFST.java → src/main/java/de/tuebingen/sfs/jfst/fst/CompactFST.java

@@ -1,4 +1,8 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.fst;
+
+import de.tuebingen.sfs.jfst.alphabet.Alphabet;
+import de.tuebingen.sfs.jfst.alphabet.Symbol;
+import de.tuebingen.sfs.jfst.io.*;
 
 import java.io.IOException;
 import java.io.InputStream;

src/main/java/de/tuebingen/sfs/jfst/FST.java → src/main/java/de/tuebingen/sfs/jfst/fst/FST.java

@@ -1,4 +1,4 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.fst;
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/de/tuebingen/sfs/jfst/FSTStateIterator.java → src/main/java/de/tuebingen/sfs/jfst/fst/FSTStateIterator.java

@@ -1,4 +1,6 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.fst;
+
+import de.tuebingen.sfs.jfst.alphabet.Alphabet;
 
 /**
  * An iterator over the states and transitions of an FST.

src/main/java/de/tuebingen/sfs/jfst/MutableFST.java → src/main/java/de/tuebingen/sfs/jfst/fst/MutableFST.java

@@ -1,5 +1,9 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.fst;
 
+import de.tuebingen.sfs.jfst.io.FSTProducer;
+import de.tuebingen.sfs.jfst.alphabet.Alphabet;
+import de.tuebingen.sfs.jfst.alphabet.Symbol;
+import de.tuebingen.sfs.jfst.io.BinaryFSTWriter;
 import de.tuebingen.sfs.util.string.StringUtils;
 import de.tuebingen.sfs.util.bin.BufferedByteReader;
 import de.tuebingen.sfs.util.bin.IOUtils;

src/main/java/de/tuebingen/sfs/jfst/BinaryFSTWriter.java → src/main/java/de/tuebingen/sfs/jfst/io/BinaryFSTWriter.java

@@ -1,5 +1,7 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.io;
 
+import de.tuebingen.sfs.jfst.fst.FST;
+import de.tuebingen.sfs.jfst.fst.FSTStateIterator;
 import de.tuebingen.sfs.util.bin.IOUtils;
 import gnu.trove.list.TIntList;
 import gnu.trove.list.array.TIntArrayList;

src/main/java/de/tuebingen/sfs/jfst/FSTFileStateIterator.java → src/main/java/de/tuebingen/sfs/jfst/io/FSTFileStateIterator.java

@@ -1,4 +1,6 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.io;
+
+import de.tuebingen.sfs.jfst.fst.FSTStateIterator;
 
 public interface FSTFileStateIterator extends FSTStateIterator {
 

src/main/java/de/tuebingen/sfs/jfst/FSTProducer.java → src/main/java/de/tuebingen/sfs/jfst/io/FSTProducer.java

@@ -1,4 +1,6 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.io;
+
+import de.tuebingen.sfs.jfst.alphabet.Symbol;
 
 /**
  * The original producer of a file. Currently supports SFST, HFST and JFST.

src/main/java/de/tuebingen/sfs/jfst/HFSTFileStateIterator.java → src/main/java/de/tuebingen/sfs/jfst/io/HFSTFileStateIterator.java

@@ -1,5 +1,7 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.io;
 
+import de.tuebingen.sfs.jfst.alphabet.Alphabet;
+import de.tuebingen.sfs.jfst.alphabet.Symbol;
 import de.tuebingen.sfs.util.bin.BufferedByteReader;
 
 import java.io.IOException;

src/main/java/de/tuebingen/sfs/jfst/JFSTFileStateIterator.java → src/main/java/de/tuebingen/sfs/jfst/io/JFSTFileStateIterator.java

@@ -1,5 +1,7 @@
-package de.tuebingen.sfs.jfst;
+package de.tuebingen.sfs.jfst.io;
 
+import de.tuebingen.sfs.jfst.alphabet.Alphabet;
+import de.tuebingen.sfs.jfst.alphabet.Symbol;
 import de.tuebingen.sfs.util.bin.BufferedByteReader;
 import de.tuebingen.sfs.util.bin.IOUtils;
 import gnu.trove.list.TIntList;