Merge pull request #1

Bump to 0.1.1, optimize SLIC index computation
okaneco · Jan 15, 2023 · ebb6398 · ebb6398
2 parents 1f0e954 + 3e7ed70
commit ebb6398
Show file tree

Hide file tree

Showing 9 changed files with 127 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # `simple_clustering` changelog
 
+## Version 0.1.1 - 2023-01
+Improved SLIC calculation speed by ~15-20% after refactoring calculation loop.
+
+[#1][1] - Bump to 0.1.1, Optimize slic index computation
+
 ## Version 0.1.0 - 2022-04
 - Initial Commit
+
+[1]: https://github.com/okaneco/simple_clustering/pull/1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simple_clustering"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 exclude = ["gfx", ".github"]
 description = "Implementations of image clustering and segmentation algorithms such as SLIC and SNIC."

diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2022 Collyn O'Kane
+   Copyright 2022-2023 Collyn O'Kane
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/LICENSE-MIT b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright 2022 Collyn O'Kane
+Copyright 2022-2023 Collyn O'Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # simple_clustering
-[![Build Status](https://img.shields.io/github/workflow/status/okaneco/simple_clustering/Rust%20CI)](https://github.com/okaneco/simple_clustering)
+[![Build Status](https://github.com/okaneco/simple_clustering/workflows/Rust%20CI/badge.svg)](https://github.com/okaneco/simple_clustering)
 [![Crates.io](https://img.shields.io/crates/v/simple_clustering.svg)](https://crates.io/crates/simple_clustering)
 [![Docs.rs](https://docs.rs/simple_clustering/badge.svg)](https://docs.rs/simple_clustering)
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -170,8 +170,8 @@ where
 /// Checks if the index is in bounds and returns a reference to the data at that
 /// point if it exists.
 #[inline]
-fn get_in_bounds<T>(width: i64, height: i64, x: i64, y: i64, image: &[T]) -> Option<&T> {
-    if (0..width).contains(&x) && (0..height).contains(&y) {
+fn get_in_bounds<T>(width: i64, _height: i64, x: i64, y: i64, image: &[T]) -> Option<&T> {
+    if (0..width).contains(&x) {
         let i = u64::try_from(y)
             .ok()?
             .checked_mul(u64::try_from(width).ok()?)?
@@ -188,12 +188,12 @@ fn get_in_bounds<T>(width: i64, height: i64, x: i64, y: i64, image: &[T]) -> Opt
 #[inline]
 fn get_mut_in_bounds<T>(
     width: i64,
-    height: i64,
+    _height: i64,
     x: i64,
     y: i64,
     image: &mut [T],
 ) -> Option<&mut T> {
-    if (0..width).contains(&x) && (0..height).contains(&y) {
+    if (0..width).contains(&x) {
         let i = u64::try_from(y)
             .ok()?
             .checked_mul(u64::try_from(width).ok()?)?