Refactor

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Library Test
+name: Application Test
 on:
   push:
   pull_request:

README.md

@@ -1,4 +1,6 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/spbu-coding-2024/graphs-team-3/badge)](https://www.codefactor.io/repository/github/spbu-coding-2024/graphs-team-3)
+
+![example workflow](https://github.com/spbu-coding-2024/graphs-team-3/actions/workflows/build.yml/badge.svg)
 ![Kotlin](https://img.shields.io/badge/Kotlin-2.1.10-blue.svg)
 ![Gradle](https://img.shields.io/badge/Gradle-8.13-brightgreen.svg)
 ![Java](https://img.shields.io/badge/Java-21-brightgreen.svg)

app/src/main/kotlin/model/algo/fordBellman/FordBellman.kt → app/src/main/kotlin/model/algo/FordBellman.kt

@@ -1,4 +1,4 @@
-package model.algo.fordBellman
+package model.algo
 
 import model.graph.Edge
 import model.graph.Graph

app/src/main/kotlin/model/algo/findBridges/findBridges.kt → app/src/main/kotlin/model/algo/findBridges.kt

@@ -1,4 +1,4 @@
-package model.algo.findBridges
+package model.algo
 
 import model.graph.Edge
 import model.graph.Graph

app/src/main/kotlin/model/algo/findCommunities.kt

@@ -4,14 +4,18 @@ import model.graph.Graph
 import model.graph.Vertex
 import org.jetbrains.research.ictl.louvain.getPartition
 
-fun findCommunities(graph: Graph, depth: Int = 2): Map<Int, List<Vertex>> {
-    val links = graph.edges.map {
-        EdgeLink(
-            from = it.vertices.first.id,
-            to = it.vertices.second.id,
-            weight = it.weight.toDouble()
-        )
-    }
+fun findCommunities(
+    graph: Graph,
+    depth: Int = 2,
+): Map<Int, List<Vertex>> {
+    val links =
+        graph.edges.map {
+            EdgeLink(
+                from = it.vertices.first.id,
+                to = it.vertices.second.id,
+                weight = it.weight.toDouble(),
+            )
+        }
 
     val partition = getPartition(links, depth).toMutableMap()
 
@@ -28,6 +32,6 @@ fun findCommunities(graph: Graph, depth: Int = 2): Map<Int, List<Vertex>> {
     return partition.entries
         .groupBy(
             keySelector = { it.value },
-            valueTransform= { idToVertex.getValue(it.key) }
+            valueTransform = { idToVertex.getValue(it.key) },
         )
 }

app/src/main/kotlin/model/algo/findMST.kt

@@ -1,7 +1,7 @@
 package model.algo
 
-import model.graph.Graph
 import model.graph.Edge
+import model.graph.Graph
 
 fun findMST(graph: Graph): Set<Edge> {
     require(!graph.isDirected) { "MST is only implemented for undirected graphs" }
@@ -10,9 +10,10 @@ fun findMST(graph: Graph): Set<Edge> {
     val mstEdges = mutableSetOf<Edge>()
 
     val verticesList = graph.vertices.toList()
-    val idToIndex = verticesList
-        .mapIndexed { index, vertex -> vertex.id to index }
-        .toMap()
+    val idToIndex =
+        verticesList
+            .mapIndexed { index, vertex -> vertex.id to index }
+            .toMap()
 
     val parents = IntArray(verticesList.size) { -1 }
 
@@ -22,7 +23,10 @@ fun findMST(graph: Graph): Set<Edge> {
         return parents[vertexId]
     }
 
-    fun unionSets(firstId: Int, secondId: Int) {
+    fun unionSets(
+        firstId: Int,
+        secondId: Int,
+    ) {
         val rootFirst = findRoot(firstId)
         val rootSecond = findRoot(secondId)
         if (rootFirst == rootSecond) return

app/src/main/kotlin/model/algo/findSCC.kt

@@ -21,7 +21,7 @@ fun findSCC(graph: Graph): Set<Set<Vertex>> {
 
     fun dfs(vertex: Vertex) {
         visited += vertex
-        for (neighbor in adjacencyList[vertex]?: throw IllegalStateException()) {
+        for (neighbor in adjacencyList[vertex] ?: throw IllegalStateException()) {
             if (neighbor !in visited) dfs(neighbor)
         }
         stack.addFirst(vertex)
@@ -30,10 +30,14 @@ fun findSCC(graph: Graph): Set<Set<Vertex>> {
     for (vertex in adjacencyList.keys) if (vertex !in visited) dfs(vertex)
 
     visited.clear()
-    fun findComponents(vertex: Vertex, component: MutableSet<Vertex>) {
+
+    fun findComponents(
+        vertex: Vertex,
+        component: MutableSet<Vertex>,
+    ) {
         visited += vertex
         component += vertex
-        for (neighbor in revAdjacencyList[vertex]?: throw IllegalStateException()) {
+        for (neighbor in revAdjacencyList[vertex] ?: throw IllegalStateException()) {
             if (neighbor !in visited) findComponents(neighbor, component)
         }
     }

app/src/main/kotlin/model/io/sqlite/sqliteRepository.kt

@@ -3,11 +3,12 @@ package model.io.sqlite
 import model.graph.*
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
+import org.jetbrains.exposed.sql.transactions.transaction
 
-class SqliteRepository(dbPath: String = "../graphs.db") {
-
+class SqliteRepository(
+    dbPath: String = "../graphs.db",
+) {
     object Graphs : IntIdTable("graphs") {
         val name = varchar("name", 52)
         val isDirected = bool("isDirected")
@@ -27,71 +28,85 @@ class SqliteRepository(dbPath: String = "../graphs.db") {
         val weight = long("weight")
     }
 
-    private val db: Database = Database.connect(
-        url = "jdbc:sqlite:$dbPath?foreign_keys=ON",
-        driver = "org.sqlite.JDBC"
-    )
+    private val db: Database =
+        Database.connect(
+            url = "jdbc:sqlite:$dbPath?foreign_keys=ON",
+            driver = "org.sqlite.JDBC",
+        )
 
     init {
         transaction(db) {
             SchemaUtils.create(Graphs, Vertices, Edges)
         }
     }
 
-    fun save(g: Graph, name: String? = null): Int = transaction(db) {
-        val gId = Graphs.insertAndGetId {
-            it[this.name] = name ?: "Graph_${System.currentTimeMillis()}"
-            it[this.isDirected] = g.isDirected
-        }.value
+    fun save(
+        g: Graph,
+        name: String? = null,
+    ): Int =
+        transaction(db) {
+            val gId =
+                Graphs
+                    .insertAndGetId {
+                        it[this.name] = name ?: "Graph_${System.currentTimeMillis()}"
+                        it[this.isDirected] = g.isDirected
+                    }.value
+
+            Vertices.batchInsert(g.vertices) { vertex ->
+                this[Vertices.graph] = gId
+                this[Vertices.label] = vertex.label
+                this[Vertices.origId] = vertex.id
+            }
 
-        Vertices.batchInsert(g.vertices) { vertex ->
-            this[Vertices.graph] = gId
-            this[Vertices.label] = vertex.label
-            this[Vertices.origId] = vertex.id
-        }
+            Edges.batchInsert(g.edges) { edge ->
+                this[Edges.graph] = gId
+                this[Edges.fromId] = edge.vertices.first.id
+                this[Edges.toId] = edge.vertices.second.id
+                this[Edges.weight] = edge.weight
+                this[Edges.origId] = edge.id
+            }
 
-        Edges.batchInsert(g.edges) { edge ->
-            this[Edges.graph] = gId
-            this[Edges.fromId] = edge.vertices.first.id
-            this[Edges.toId] = edge.vertices.second.id
-            this[Edges.weight] = edge.weight
-            this[Edges.origId] = edge.id
+            gId
         }
 
-        gId
-    }
-
-    fun delete(gId: Int) = transaction(db) {
-        Graphs.deleteWhere { id eq gId }
-    }
-
-    fun read(gId: Int): Graph = transaction(db) {
-        val directed = Graphs
-            .selectAll()
-            .where { Graphs.id eq gId }
-            .single()
-            .let { it[Graphs.isDirected] }
-
-        val g = Graph(isDirected = directed)
-
-        Vertices
-            .selectAll()
-            .where { Vertices.graph eq gId }
-            .forEach { row ->
-                g.addVertex(row[Vertices.origId], row[Vertices.label])
-            }
-
-        Edges
-            .selectAll()
-            .where { Edges.graph eq gId }
-            .forEach { row ->
-                g.addEdge(row[Edges.fromId], row[Edges.toId], row[Edges.weight])
-            }
+    fun delete(gId: Int) =
+        transaction(db) {
+            Graphs.deleteWhere { id eq gId }
+        }
 
-        g
-    }
+    fun read(gId: Int): Graph =
+        transaction(db) {
+            val directed =
+                Graphs
+                    .selectAll()
+                    .where { Graphs.id eq gId }
+                    .single()
+                    .let { it[Graphs.isDirected] }
+
+            val g = Graph(isDirected = directed)
+
+            Vertices
+                .selectAll()
+                .where { Vertices.graph eq gId }
+                .forEach { row ->
+                    g.addVertex(row[Vertices.origId], row[Vertices.label])
+                }
+
+            Edges
+                .selectAll()
+                .where { Edges.graph eq gId }
+                .forEach { row ->
+                    g.addEdge(row[Edges.fromId], row[Edges.toId], row[Edges.weight])
+                }
+
+            g
+        }
 
-    fun update(gId: Int, g: Graph, newName: String? = null) = transaction(db) {
+    fun update(
+        gId: Int,
+        g: Graph,
+        newName: String? = null,
+    ) = transaction(db) {
         Graphs.update({ Graphs.id eq gId }) {
             it[isDirected] = g.isDirected
             if (newName != null) it[name] = newName
@@ -115,14 +130,19 @@ class SqliteRepository(dbPath: String = "../graphs.db") {
         }
     }
 
-    fun listGraphs(filter: String = ""): List<Pair<Int, String>> = transaction(db) {
-        val q = if (filter.isBlank())
-            Graphs.selectAll()
-        else
-            Graphs.selectAll()
-                .where { Graphs.name like "%$filter%" }
-
-        q.orderBy(Graphs.name to SortOrder.ASC)
-            .map { it[Graphs.id].value to it[Graphs.name] }
-    }
+    fun listGraphs(filter: String = ""): List<Pair<Int, String>> =
+        transaction(db) {
+            val q =
+                if (filter.isBlank()) {
+                    Graphs.selectAll()
+                } else {
+                    Graphs
+                        .selectAll()
+                        .where { Graphs.name like "%$filter%" }
+                }
+
+            q
+                .orderBy(Graphs.name to SortOrder.ASC)
+                .map { it[Graphs.id].value to it[Graphs.name] }
+        }
 }

app/src/main/kotlin/view/dialogs/SqliteDeleteDialog.kt

@@ -6,11 +6,11 @@ import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Warning
 import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.unit.dp
 import viewmodel.colors.ColorTheme
 
 @Composable
@@ -32,31 +32,31 @@ fun SqliteDeleteDialog(
                     Text("Delete \"$graphName\"?")
                 }
             },
-            text = { Text("This action cannot be undone")},
+            text = { Text("This action cannot be undone") },
             buttons = {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.End,
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     TextButton(
                         modifier = Modifier.padding(end = 16.dp),
                         onClick = {
                             open = false
                             onDismiss()
-                        }
+                        },
                     ) { Text("Cancel", color = ColorTheme.TextColor) }
                     Button(
                         modifier = Modifier.padding(end = 16.dp),
                         onClick = {
                             onConfirm()
                             open = false
                         },
-                        colors = ButtonDefaults.buttonColors(ColorTheme.rejectColor)
+                        colors = ButtonDefaults.buttonColors(ColorTheme.rejectColor),
                     ) { Text("Delete") }
                 }
             },
-            modifier = Modifier.clip(RoundedCornerShape(percent = 5))
+            modifier = Modifier.clip(RoundedCornerShape(percent = 5)),
         )
     }
 }

app/src/main/kotlin/view/dialogs/SqliteOverwriteDialog.kt

@@ -33,33 +33,35 @@ fun OverwriteDialog(
                 }
             },
             text = {
-                Text("Graph \"$graphName\" will be overwritten. Continue?") },
+                Text("Graph \"$graphName\" will be overwritten. Continue?")
+            },
             buttons = {
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.End,
-                    verticalAlignment = Alignment.CenterVertically
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
                     TextButton(
                         modifier = Modifier.padding(end = 16.dp),
                         onClick = {
                             open = false
                             onDismiss()
-                        }
+                        },
                     ) { Text("Cancel", color = ColorTheme.TextColor) }
                     Button(
                         modifier = Modifier.padding(end = 16.dp),
                         onClick = {
                             onConfirm()
                             open = false
                         },
-                        colors = ButtonDefaults.buttonColors(ColorTheme.rejectColor)
+                        colors = ButtonDefaults.buttonColors(ColorTheme.rejectColor),
                     ) { Text("Continue") }
                 }
             },
-            modifier = Modifier
-                .fillMaxWidth()
-                .clip(RoundedCornerShape(percent = 5))
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(percent = 5)),
         )
     }
 }