PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-24 11:57:59 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'hkos/heiko/algo' into wot

Browse source
This commit is contained in:
Paul Schaub 2023-07-17 12:47:39 +02:00
commit 5f447dc9d5
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
8 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/package-info.java
View file

@ -1,5 +0,0 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra;

6
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/Cost.kt → wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Cost.kt
View file

@ -1,8 +1,4 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra
package org.pgpainless.wot.query
import kotlin.math.min

6
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/ForwardPointer.kt → wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/ForwardPointer.kt
View file

@ -1,8 +1,4 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra
package org.pgpainless.wot.query
import org.pgpainless.wot.network.EdgeComponent

8
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/PairPriorityQueue.kt → wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/PairPriorityQueue.kt
View file

@ -1,10 +1,6 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.query
package org.pgpainless.wot.dijkstra
import java.util.PriorityQueue
import java.util.*
/**
* A de-duplicating min-priority queue for key-value pairs.

15
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/Query.kt → wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Query.kt
View file

@ -1,12 +1,9 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.query
package org.pgpainless.wot.dijkstra
import org.pgpainless.wot.network.*
import org.pgpainless.wot.query.Path
import org.pgpainless.wot.query.Paths
import org.pgpainless.wot.network.Fingerprint
import org.pgpainless.wot.network.Network
import org.pgpainless.wot.network.Node
import org.pgpainless.wot.network.Roots
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import kotlin.math.max
@ -289,4 +286,4 @@ class Query(private val rawNetwork: Network,
return p
}
}
}

7
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/WotNetwork.kt → wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/WotNetwork.kt
View file

@ -1,11 +1,6 @@
// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer.name>
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra
package org.pgpainless.wot.query
import org.pgpainless.wot.network.*
import org.pgpainless.wot.query.Path
/**
* A wrapper for `Network` that performs the following functions:

3
wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/CostTest.kt → wot-dijkstra/src/test/kotlin/org/pgpainless/wot/query/CostTest.kt
View file

@ -2,8 +2,9 @@
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra
package org.pgpainless.wot.query
import org.pgpainless.wot.query.Cost
import kotlin.test.Test
class CostTest {

2
wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PairPriorityQueueTest.kt → wot-dijkstra/src/test/kotlin/org/pgpainless/wot/query/PairPriorityQueueTest.kt
View file

@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: Apache-2.0
package org.pgpainless.wot.dijkstra
package org.pgpainless.wot.query
import kotlin.test.Test
import kotlin.test.assertEquals