ArrayList optimization

vadyushkins · vadyushkins · commit 8e177de47523 · 2023-04-27T18:55:47.000+03:00
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 group = "vadyushkins"
 
-version = "1.0.2"
+version = "1.0.3"
 
 repositories { mavenCentral() }
 
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/Alternative.kt b/src/main/kotlin/org/kotgll/cfg/grammar/Alternative.kt
@@ -3,7 +3,9 @@ package org.kotgll.cfg.grammar
 import org.kotgll.cfg.grammar.symbol.Nonterminal
 import org.kotgll.cfg.grammar.symbol.Symbol
 
-class Alternative(val elements: List<Symbol>) {
+class Alternative(val elements: ArrayList<Symbol>) {
+  constructor(elements: List<Symbol>) : this(ArrayList(elements))
+
   lateinit var nonterminal: Nonterminal
 
   override fun toString() = "Alternative($elements)"
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/CFGRead.kt b/src/main/kotlin/org/kotgll/cfg/grammar/CFGRead.kt
@@ -34,7 +34,7 @@ fun readCFGFromTXT(pathToTXT: String): Nonterminal {
           makeNonterminal(
               nonterminalRegex.matchEntire(alternativeNonterminal)!!.groups["value"]!!.value)
 
-      val elements: MutableList<Symbol> = mutableListOf()
+      val elements: ArrayList<Symbol> = ArrayList()
       for (element in alternativeElements.split(' ')) {
         if (terminalRegex.matches(element)) {
           val elementValue = terminalRegex.matchEntire(element)!!.groups["value"]!!.value
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/CFGWrite.kt b/src/main/kotlin/org/kotgll/cfg/grammar/CFGWrite.kt
@@ -5,7 +5,7 @@ import org.kotgll.cfg.grammar.symbol.Terminal
 import java.io.File
 
 fun writeCFGToTXT(cfg: Nonterminal, pathToTXT: String) {
-  val alternatives: MutableList<Alternative> = mutableListOf()
+  val alternatives: ArrayList<Alternative> = ArrayList()
   val nonterminals: HashSet<Nonterminal> = HashSet()
   val queue: ArrayDeque<Nonterminal> = ArrayDeque(listOf(cfg))
   while (!queue.isEmpty()) {
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Nonterminal.kt b/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Nonterminal.kt
@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative
 
 open class Nonterminal(
     val name: String,
-    val alternatives: MutableList<Alternative> = emptyList<Alternative>().toMutableList(),
+    val alternatives: ArrayList<Alternative> = ArrayList(),
 ) : Symbol {
   override fun toString() = "Nonterminal($name)"
 
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Optional.kt b/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Optional.kt
@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative
 
 class Optional(symbol: Symbol) : Regular(symbol, "?") {
   init {
-    addAlternative(Alternative(listOf(symbol)))
-    addAlternative(Alternative(emptyList()))
+    addAlternative(Alternative(ArrayList(listOf(symbol))))
+    addAlternative(Alternative(ArrayList()))
   }
 }
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Plus.kt b/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Plus.kt
@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative
 
 class Plus(symbol: Symbol) : Regular(symbol, "+") {
   init {
-    addAlternative(Alternative(listOf(symbol)))
-    addAlternative(Alternative(listOf(symbol, this)))
+    addAlternative(Alternative(ArrayList(listOf(symbol))))
+    addAlternative(Alternative(ArrayList(listOf(symbol, this))))
   }
 }
diff --git a/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Star.kt b/src/main/kotlin/org/kotgll/cfg/grammar/symbol/Star.kt
@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative
 
 class Star(symbol: Symbol) : Regular(symbol, "*") {
   init {
-    addAlternative(Alternative(listOf()))
-    addAlternative(Alternative(listOf(symbol, this)))
+    addAlternative(Alternative(ArrayList()))
+    addAlternative(Alternative(ArrayList(listOf(symbol, this))))
   }
 }
diff --git a/src/main/kotlin/org/kotgll/cfg/graphinput/withoutsppf/GLL.kt b/src/main/kotlin/org/kotgll/cfg/graphinput/withoutsppf/GLL.kt
@@ -6,7 +6,12 @@ import org.kotgll.cfg.grammar.symbol.Symbol
 import org.kotgll.cfg.grammar.symbol.Terminal
 import org.kotgll.graph.GraphNode
 
-class GLL(val startSymbol: Nonterminal, val startGraphNodes: List<GraphNode>) {
+class GLL(val startSymbol: Nonterminal, val startGraphNodes: ArrayList<GraphNode>) {
+  constructor(
+      startSymbol: Nonterminal,
+      startGraphNodes: List<GraphNode>
+  ) : this(startSymbol, ArrayList(startGraphNodes))
+
   val queue: DescriptorsQueue = DescriptorsQueue()
   val poppedGSSNodes: HashMap<GSSNode, HashSet<GraphNode>> = HashMap()
   val createdGSSNodes: HashMap<GSSNode, GSSNode> = HashMap()
diff --git a/src/main/kotlin/org/kotgll/cfg/graphinput/withsppf/GLL.kt b/src/main/kotlin/org/kotgll/cfg/graphinput/withsppf/GLL.kt
@@ -7,7 +7,12 @@ import org.kotgll.cfg.grammar.symbol.Terminal
 import org.kotgll.cfg.graphinput.withsppf.sppf.*
 import org.kotgll.graph.GraphNode
 
-class GLL(val startSymbol: Nonterminal, val startGraphNodes: List<GraphNode>) {
+class GLL(val startSymbol: Nonterminal, val startGraphNodes: ArrayList<GraphNode>) {
+  constructor(
+      startSymbol: Nonterminal,
+      startGraphNodes: List<GraphNode>
+  ) : this(startSymbol, ArrayList(startGraphNodes))
+
   val queue: DescriptorsQueue = DescriptorsQueue()
   val poppedGSSNodes: HashMap<GSSNode, HashSet<SPPFNode?>> = HashMap()
   val createdGSSNodes: HashMap<GSSNode, GSSNode> = HashMap()
@@ -89,7 +94,7 @@ class GLL(val startSymbol: Nonterminal, val startGraphNodes: List<GraphNode>) {
   fun pop(gssNode: GSSNode, sppfNode: SPPFNode?, pos: GraphNode) {
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(sppfNode)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(
             e.key.first,
diff --git a/src/main/kotlin/org/kotgll/cfg/stringinput/withoutsppf/GLL.kt b/src/main/kotlin/org/kotgll/cfg/stringinput/withoutsppf/GLL.kt
@@ -68,7 +68,7 @@ class GLL(val startSymbol: Nonterminal, val input: String) {
         parseResult = true
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(pos)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(e.key.first, e.key.second, u, pos)
       }
diff --git a/src/main/kotlin/org/kotgll/cfg/stringinput/withsppf/GLL.kt b/src/main/kotlin/org/kotgll/cfg/stringinput/withsppf/GLL.kt
@@ -84,7 +84,7 @@ class GLL(val startSymbol: Nonterminal, val input: String) {
   fun pop(gssNode: GSSNode, sppfNode: SPPFNode?, pos: Int) {
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(sppfNode)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(
             e.key.first,
diff --git a/src/main/kotlin/org/kotgll/graph/GraphNode.kt b/src/main/kotlin/org/kotgll/graph/GraphNode.kt
@@ -1,7 +1,7 @@
 package org.kotgll.graph
 
 class GraphNode(val id: Int, var isStart: Boolean = false, var isFinal: Boolean = false) {
-  var outgoingEdges: HashMap<String, HashSet<GraphNode>> = HashMap()
+  var outgoingEdges: HashMap<String, ArrayList<GraphNode>> = HashMap()
 
   override fun toString() = "GraphNode(id=$id, isStart=$isStart, isFinal=$isFinal)"
 
@@ -18,7 +18,7 @@ class GraphNode(val id: Int, var isStart: Boolean = false, var isFinal: Boolean
   override fun hashCode() = id
 
   fun addEdge(label: String, head: GraphNode) {
-    if (!outgoingEdges.containsKey(label)) outgoingEdges[label] = HashSet()
-    outgoingEdges[label]!!.add(head)
+    if (!outgoingEdges.containsKey(label)) outgoingEdges[label] = ArrayList()
+    if (!outgoingEdges[label]!!.contains(head)) outgoingEdges[label]!!.add(head)
   }
 }
diff --git a/src/main/kotlin/org/kotgll/graph/GraphRead.kt b/src/main/kotlin/org/kotgll/graph/GraphRead.kt
@@ -14,7 +14,7 @@ fun readGraphFromString(input: String): GraphNode {
   return result
 }
 
-fun readGraphFromCSV(pathToCSV: String): List<GraphNode> {
+fun readGraphFromCSV(pathToCSV: String): ArrayList<GraphNode> {
   val graphNodes: HashMap<Int, GraphNode> = HashMap()
   fun makeGraphNode(id: Int, isStart: Boolean = false, isFinal: Boolean = false): GraphNode {
     val y = GraphNode(id, isStart, isFinal)
@@ -33,5 +33,5 @@ fun readGraphFromCSV(pathToCSV: String): List<GraphNode> {
     tailGraphNode.addEdge(label, headGraphNode)
   }
 
-  return graphNodes.values.toList()
+  return ArrayList(graphNodes.values)
 }
diff --git a/src/main/kotlin/org/kotgll/graph/GraphWrite.kt b/src/main/kotlin/org/kotgll/graph/GraphWrite.kt
@@ -2,8 +2,8 @@ package org.kotgll.graph
 
 import java.io.File
 
-fun writeGraphToCSV(graph: List<GraphNode>, pathToCSV: String) {
-  val edges: MutableList<Triple<GraphNode, String, GraphNode>> = mutableListOf()
+fun writeGraphToCSV(graph: ArrayList<GraphNode>, pathToCSV: String) {
+  val edges: ArrayList<Triple<GraphNode, String, GraphNode>> = ArrayList()
 
   val visited: HashSet<GraphNode> = HashSet()
   val queue: ArrayDeque<GraphNode> = ArrayDeque(graph)
diff --git a/src/main/kotlin/org/kotgll/rsm/grammar/RSMNonterminalEdge.kt b/src/main/kotlin/org/kotgll/rsm/grammar/RSMNonterminalEdge.kt
@@ -1,7 +1,6 @@
 package org.kotgll.rsm.grammar
 
 import org.kotgll.rsm.grammar.symbol.Nonterminal
-import java.util.*
 
 class RSMNonterminalEdge(val nonterminal: Nonterminal, val head: RSMState) : RSMEdge {
   override fun toString() = "RSMNonterminalEdge(nonterminal=$nonterminal, head=$head)"
@@ -16,6 +15,6 @@ class RSMNonterminalEdge(val nonterminal: Nonterminal, val head: RSMState) : RSM
     return true
   }
 
-  val hashCode: Int = Objects.hash(nonterminal)
+  val hashCode: Int = nonterminal.hashCode
   override fun hashCode() = hashCode
 }
diff --git a/src/main/kotlin/org/kotgll/rsm/grammar/RSMState.kt b/src/main/kotlin/org/kotgll/rsm/grammar/RSMState.kt
@@ -8,8 +8,8 @@ class RSMState(
     val isStart: Boolean = false,
     val isFinal: Boolean = false
 ) {
-  val outgoingTerminalEdges: MutableList<RSMTerminalEdge> = mutableListOf()
-  val outgoingNonterminalEdges: MutableList<RSMNonterminalEdge> = mutableListOf()
+  val outgoingTerminalEdges: ArrayList<RSMTerminalEdge> = ArrayList()
+  val outgoingNonterminalEdges: ArrayList<RSMNonterminalEdge> = ArrayList()
 
   override fun toString() =
       "RSMState(id=$id, nonterminal=$nonterminal, isStart=$isStart, isFinal=$isFinal)"
diff --git a/src/main/kotlin/org/kotgll/rsm/grammar/RSMTerminalEdge.kt b/src/main/kotlin/org/kotgll/rsm/grammar/RSMTerminalEdge.kt
@@ -1,7 +1,6 @@
 package org.kotgll.rsm.grammar
 
 import org.kotgll.rsm.grammar.symbol.Terminal
-import java.util.*
 
 class RSMTerminalEdge(val terminal: Terminal, val head: RSMState) : RSMEdge {
   override fun toString() = "RSMTerminalEdge(terminal=$terminal, head=$head)"
@@ -16,6 +15,6 @@ class RSMTerminalEdge(val terminal: Terminal, val head: RSMState) : RSMEdge {
     return true
   }
 
-  val hashCode: Int = Objects.hash(terminal)
+  val hashCode: Int = terminal.hashCode
   override fun hashCode() = hashCode
 }
diff --git a/src/main/kotlin/org/kotgll/rsm/grammar/RSMWrite.kt b/src/main/kotlin/org/kotgll/rsm/grammar/RSMWrite.kt
@@ -3,14 +3,14 @@ package org.kotgll.rsm.grammar
 import java.io.File
 
 fun writeRSMToTXT(rsm: RSMState, pathToTXT: String) {
-  val states: MutableList<RSMState> = mutableListOf()
-  val edges: HashMap<RSMState, MutableList<RSMEdge>> = hashMapOf()
+  val states: ArrayList<RSMState> = ArrayList()
+  val edges: HashMap<RSMState, ArrayList<RSMEdge>> = HashMap()
 
   val queue: ArrayDeque<RSMState> = ArrayDeque(listOf(rsm))
   while (!queue.isEmpty()) {
     val v = queue.removeFirst()
     states.add(v)
-    if (!edges.containsKey(v)) edges[v] = mutableListOf()
+    if (!edges.containsKey(v)) edges[v] = ArrayList()
     for (edge in v.outgoingTerminalEdges) {
       if (!edges[v]!!.contains(edge)) edges[v]!!.add(edge)
       if (!states.contains(edge.head)) queue.addLast(edge.head)
diff --git a/src/main/kotlin/org/kotgll/rsm/graphinput/withoutsppf/GLL.kt b/src/main/kotlin/org/kotgll/rsm/graphinput/withoutsppf/GLL.kt
@@ -4,7 +4,12 @@ import org.kotgll.graph.GraphNode
 import org.kotgll.rsm.grammar.RSMState
 import org.kotgll.rsm.grammar.symbol.Nonterminal
 
-class GLL(val startState: RSMState, val startGraphNodes: List<GraphNode>) {
+class GLL(val startState: RSMState, val startGraphNodes: ArrayList<GraphNode>) {
+  constructor(
+      startState: RSMState,
+      startGraphNodes: List<GraphNode>
+  ) : this(startState, ArrayList(startGraphNodes))
+
   val queue: DescriptorsQueue = DescriptorsQueue()
   val poppedGSSNodes: HashMap<GSSNode, HashSet<GraphNode>> = HashMap()
   val createdGSSNodes: HashMap<GSSNode, GSSNode> = HashMap()
@@ -55,7 +60,7 @@ class GLL(val startState: RSMState, val startGraphNodes: List<GraphNode>) {
     }
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(pos)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(e.key, u, pos)
       }
diff --git a/src/main/kotlin/org/kotgll/rsm/graphinput/withsppf/GLL.kt b/src/main/kotlin/org/kotgll/rsm/graphinput/withsppf/GLL.kt
@@ -6,7 +6,12 @@ import org.kotgll.rsm.grammar.symbol.Nonterminal
 import org.kotgll.rsm.grammar.symbol.Terminal
 import org.kotgll.rsm.graphinput.withsppf.sppf.*
 
-class GLL(val startState: RSMState, val startGraphNodes: List<GraphNode>) {
+class GLL(val startState: RSMState, val startGraphNodes: ArrayList<GraphNode>) {
+  constructor(
+      startState: RSMState,
+      startGraphNodes: List<GraphNode>
+  ) : this(startState, ArrayList(startGraphNodes))
+
   val queue: DescriptorsQueue = DescriptorsQueue()
   val poppedGSSNodes: HashMap<GSSNode, HashSet<SPPFNode?>> = HashMap()
   val createdGSSNodes: HashMap<GSSNode, GSSNode> = HashMap()
@@ -67,7 +72,7 @@ class GLL(val startState: RSMState, val startGraphNodes: List<GraphNode>) {
   fun pop(gssNode: GSSNode, sppfNode: SPPFNode?, pos: GraphNode) {
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(sppfNode)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(e.key.first, u, getNodeP(e.key.first, e.key.second, sppfNode!!), pos)
       }
diff --git a/src/main/kotlin/org/kotgll/rsm/stringinput/withoutsppf/GLL.kt b/src/main/kotlin/org/kotgll/rsm/stringinput/withoutsppf/GLL.kt
@@ -52,7 +52,7 @@ class GLL(val startState: RSMState, val input: String) {
         parseResult = true
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(pos)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(e.key, u, pos)
       }
diff --git a/src/main/kotlin/org/kotgll/rsm/stringinput/withsppf/GLL.kt b/src/main/kotlin/org/kotgll/rsm/stringinput/withsppf/GLL.kt
@@ -62,7 +62,7 @@ class GLL(val startState: RSMState, val input: String) {
   fun pop(gssNode: GSSNode, sppfNode: SPPFNode?, pos: Int) {
     if (!poppedGSSNodes.containsKey(gssNode)) poppedGSSNodes[gssNode] = HashSet()
     poppedGSSNodes[gssNode]!!.add(sppfNode)
-    for (e in gssNode.edges.entries) {
+    for (e in gssNode.edges) {
       for (u in e.value) {
         queue.add(e.key.first, u, getNodeP(e.key.first, e.key.second, sppfNode!!), pos)
       }
diff --git a/src/test/kotlin/cli/TestGraphReadWriteCSV.kt b/src/test/kotlin/cli/TestGraphReadWriteCSV.kt
@@ -15,7 +15,7 @@ class TestGraphReadWriteCSV {
     val expectedGraphNodes = listOf(graphNode0, graphNode1)
 
     val pathToCSV = "src/test/resources/cli/TestGraphReadWriteCSV/OneEdgeGraph.csv"
-    writeGraphToCSV(expectedGraphNodes, pathToCSV)
+    writeGraphToCSV(ArrayList(expectedGraphNodes), pathToCSV)
     val actualGraphNodes = readGraphFromCSV(pathToCSV)
 
     assertEquals(expected = expectedGraphNodes, actual = actualGraphNodes)
@@ -31,7 +31,7 @@ class TestGraphReadWriteCSV {
     val expectedGraphNodes = listOf(graphNode0, graphNode1, graphNode2)
 
     val pathToCSV = "src/test/resources/cli/TestGraphReadWriteCSV/TwoEdgesGraph.csv"
-    writeGraphToCSV(expectedGraphNodes, pathToCSV)
+    writeGraphToCSV(ArrayList(expectedGraphNodes), pathToCSV)
     val actualGraphNodes = readGraphFromCSV(pathToCSV)
 
     assertEquals(expected = expectedGraphNodes, actual = actualGraphNodes)
@@ -48,7 +48,7 @@ class TestGraphReadWriteCSV {
     val expectedGraphNodes = listOf(graphNode0, graphNode1, graphNode2)
 
     val pathToCSV = "src/test/resources/cli/TestGraphReadWriteCSV/OneCycleGraph.csv"
-    writeGraphToCSV(expectedGraphNodes, pathToCSV)
+    writeGraphToCSV(ArrayList(expectedGraphNodes), pathToCSV)
     val actualGraphNodes = readGraphFromCSV(pathToCSV)
 
     assertEquals(expected = expectedGraphNodes, actual = actualGraphNodes)
@@ -70,7 +70,7 @@ class TestGraphReadWriteCSV {
     graphNode3.addEdge(")", graphNode2)
 
     val pathToCSV = "src/test/resources/cli/TestGraphReadWriteCSV/dyck.csv"
-    writeGraphToCSV(expectedGraphNodes, pathToCSV)
+    writeGraphToCSV(ArrayList(expectedGraphNodes), pathToCSV)
     val actualGraphNodes = readGraphFromCSV(pathToCSV)
 
     assertEquals(expected = expectedGraphNodes, actual = actualGraphNodes)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative`
`4`	`4`
`5`	`5`	`class Optional(symbol: Symbol) : Regular(symbol, "?") {`
`6`	`6`	`init {`
`7`		`- addAlternative(Alternative(listOf(symbol)))`
`8`		`- addAlternative(Alternative(emptyList()))`
	`7`	`+ addAlternative(Alternative(ArrayList(listOf(symbol))))`
	`8`	`+ addAlternative(Alternative(ArrayList()))`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative`
`4`	`4`
`5`	`5`	`class Plus(symbol: Symbol) : Regular(symbol, "+") {`
`6`	`6`	`init {`
`7`		`- addAlternative(Alternative(listOf(symbol)))`
`8`		`- addAlternative(Alternative(listOf(symbol, this)))`
	`7`	`+ addAlternative(Alternative(ArrayList(listOf(symbol))))`
	`8`	`+ addAlternative(Alternative(ArrayList(listOf(symbol, this))))`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import org.kotgll.cfg.grammar.Alternative`
`4`	`4`
`5`	`5`	`class Star(symbol: Symbol) : Regular(symbol, "*") {`
`6`	`6`	`init {`
`7`		`- addAlternative(Alternative(listOf()))`
`8`		`- addAlternative(Alternative(listOf(symbol, this)))`
	`7`	`+ addAlternative(Alternative(ArrayList()))`
	`8`	`+ addAlternative(Alternative(ArrayList(listOf(symbol, this))))`
`9`	`9`	`}`
`10`	`10`	`}`