Move SSD learned feature distance to typed Kotlin
ober
dca607d6765f0ac3d46a33d9739c96a7d541d889
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#52f5326a4d8ff0b34274a6b7c6260a8bc5fe1329" + - "https://git.sr.ht/~lisp/jerboa#f07bc095c3152b25cb4ad98cdc44208ea7201f4e" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = 52f5326a4d8ff0b34274a6b7c6260a8bc5fe1329 - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 24fc6d28102255170cd37dd3c8dcbd5e415ac4a6 + test "$(git -C ../jerboa rev-parse HEAD)" = f07bc095c3152b25cb4ad98cdc44208ea7201f4e + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = febf0f4fc474f964daa84a69295d8f0bb873619b JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "52f5326a4d8ff0b34274a6b7c6260a8bc5fe1329", - "tree": "24fc6d28102255170cd37dd3c8dcbd5e415ac4a6" + "commit": "f07bc095c3152b25cb4ad98cdc44208ea7201f4e", + "tree": "febf0f4fc474f964daa84a69295d8f0bb873619b" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=52f5326a4d8ff0b34274a6b7c6260a8bc5fe1329 # gitsafe:ignore -jerboa_tree=24fc6d28102255170cd37dd3c8dcbd5e415ac4a6 # gitsafe:ignore +jerboa_commit=f07bc095c3152b25cb4ad98cdc44208ea7201f4e # gitsafe:ignore +jerboa_tree=febf0f4fc474f964daa84a69295d8f0bb873619b # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -1064,7 +1064,7 @@ (typed-kotlin-file "com/sfb/ssdreview/LearnedFeatures.kt" (kotlin-imports (org json JSONArray) (org json JSONObject)) (typed-library (com sfb ssdreview) - (export groupFeaturesFromTruthGroup groupFeaturesFromGroup) + (export groupFeaturesFromTruthGroup groupFeaturesFromGroup featureDistance) (type JSONArray) (type JSONObject) (type Float32) @@ -1080,6 +1080,14 @@ (float32 1.0))) (def (featureSafeImage (value : Int32)) : Float32 (featurePositiveFloat (float32 value))) + (def (featureFloor (value : Float32) (floor : Float32)) : Float32 + (if (> value floor) + value + floor)) + (def (featureField (json : JSONObject) (key : String)) : Float32 + (json-object-opt-float32-default json key (float32 0.0))) + (def (featureAspectField (json : JSONObject)) : Float32 + (json-object-opt-float32-default json "aspect" (float32 1.0))) (def (featureObject (count : Int32) (x1 : Float32) (y1 : Float32) @@ -1125,7 +1133,29 @@ (float-array-ref bbox (int32 2)) (float-array-ref bbox (int32 3)) imageWidth - imageHeight))))) + imageHeight))) + (def (featureDistance (a : JSONObject) (b : JSONObject)) : Float32 + (let ((countA (featureField a "count")) + (countB (featureField b "count"))) + (let ((countDelta + (/ (float32-abs (- countA countB)) + (float32-max (float32 1.0) + (float32-max countA countB)))) + (dx (float32-abs (- (featureField a "cx") (featureField b "cx")))) + (dy (float32-abs (- (featureField a "cy") (featureField b "cy")))) + (dw (float32-abs (- (featureField a "w") (featureField b "w")))) + (dh (float32-abs (- (featureField a "h") (featureField b "h")))) + (aspect + (float32-abs + (float32-ln + (featureFloor + (/ (featureAspectField a) (featureAspectField b)) + (float32 0.05)))))) + (+ (+ (+ (+ (* dx (float32 1.2)) + (* dy (float32 1.2))) + (+ dw dh)) + (* countDelta (float32 0.30))) + (* aspect (float32 0.08)))))))) (typed-kotlin-file "com/sfb/ssdreview/Guess.kt" (typed-library (com sfb ssdreview) @@ -5885,18 +5915,6 @@ " return file.inputStream().use { readBoundedBytes(it, MAX_ZIP_ENTRY_BYTES).decodeToString() }" " }" "" - " private fun featureDistance(a: JSONObject, b: JSONObject): Float {" - " val countA = a.optDouble(\"count\", 0.0)" - " val countB = b.optDouble(\"count\", 0.0)" - " val countDelta = kotlin.math.abs(countA - countB) / kotlin.math.max(1.0, kotlin.math.max(countA, countB))" - " val dx = kotlin.math.abs(a.optDouble(\"cx\") - b.optDouble(\"cx\"))" - " val dy = kotlin.math.abs(a.optDouble(\"cy\") - b.optDouble(\"cy\"))" - " val dw = kotlin.math.abs(a.optDouble(\"w\") - b.optDouble(\"w\"))" - " val dh = kotlin.math.abs(a.optDouble(\"h\") - b.optDouble(\"h\"))" - " val aspect = kotlin.math.abs(kotlin.math.ln((a.optDouble(\"aspect\", 1.0) / b.optDouble(\"aspect\", 1.0)).coerceAtLeast(0.05)))" - " return (dx * 1.2 + dy * 1.2 + dw + dh + countDelta * 0.30 + aspect * 0.08).toFloat()" - " }" - "" " private fun suppressedLearnedExample(session: SsdSession, example: JSONObject): Boolean {" " val label = example.optString(\"label\")" " val boxTypeId = example.optString(\"box_type_id\")"