Develop v1.1.1 (#32)

* Matrix
[+] Добавил матричный размер и инициализацию матрицы с использованием размера.
[+] Написал для них тесты.

* Factorial
[+] Добавил expect/actual для реализации BigInteger в android на платформах IOS, android, JVM, LinuxX64

* Test
[~] Исправил тест

* Matrix, Readme, tests
[+] Добавил оператор compateTo для матриц.
[+] Добавил тесты.
[+] Добавил в доку поиск минимального пути на графе, операторы для матриц, факториал.

* expect/actual
[+] Добавил BigFloat
[+] Добавил bigTetraction гипер оператор.
[+] Добавил тесты.

* Readme
[~] Обновил ридмишки

* Readme
[~] Обновил ридмишки

* Update README.md

* Matrix
[+] Добавила метод для поиска в матрице.

* Matrix
[+] Добавила тест.

* Native
[+] Добавил нативный гипероператор.

* Native
[+] Обновил гит игнор.

* Library
[+] Перенёс нативную либу в library.
[~] Сделал контекст выполнения юнит тестов в JVM.
[+] Добавил контекст выполнения тестов в Android.

* Library
[+] merge

* Library
[-] Удалил запуск тестов для android.

* Library
[+] Добавил нативные функции.

* Library
[~] обновил версионный каталог.

* Library
[+] Добавил JNI кода!

---------

Co-authored-by: Slava <[email protected]>
Co-authored-by: Slava <[email protected]>

Author: Yulia4452873558

.github/workflows/library unit test.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v1
       - name: set up JDK
@@ -18,4 +18,4 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Unit Test
-        run: ./gradlew :library:testDebugUnitTest
+        run: ./gradlew :library:JvmTest

.gitignore

@@ -17,6 +17,9 @@ Pods/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+# Cpp
+.cxx
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

.idea/kotlinc.xml

@@ -2,4 +2,5 @@ plugins {
     alias(libs.plugins.androidLibrary).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)
     alias(libs.plugins.vanniktech.mavenPublish).apply(false)
+    alias(libs.plugins.kotlin.android) apply false
 }

build.gradle.kts

@@ -8,6 +8,7 @@
 # More math
 
 Kotlin multiplatform library adding mathematical operations with matrices, vectors, combinatorics and much more.
+![Telegram](https://github.com/plumsoftware/more-math/blob/develop-v0.0.1/docs/images/telegram.svg)  Telegram emoji are available below the link https://t.me/addemoji/RkIQSnNfAAA
 
 ![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)
 <br>Telegram emoji are available below the link https://t.me/addemoji/RkIQSnNfAAA

docs/images/telegram.svg

@@ -2,22 +2,35 @@
 agp = "8.3.0"
 kotlin = "2.0.0"
 nexus-publish = "2.0.0"
-android-minSdk = "24"
-android-compileSdk = "34"
+android-minSdk = "21"
+android-compileSdk = "35"
 mavenPublish = "0.29.0"
 
 #Coroutines
 kotlin-coroutines = "1.9.0"
+kotlinVersion = "1.9.0"
+coreKtx = "1.15.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+material = "1.12.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-nexus-publish = { module = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin", version.ref = "nexus-publish" }
 
 #Coroutines
 kotlin-coroutines = {module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines"}
 kotlin-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlin-coroutines" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 [plugins]
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-vanniktech-mavenPublish = {id = "com.vanniktech.maven.publish", version.ref = "mavenPublish"}
+vanniktech-mavenPublish = {id = "com.vanniktech.maven.publish", version.ref = "mavenPublish"}
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }

docs/languages/README-en.md

@@ -51,13 +51,28 @@ android {
     compileSdk = libs.versions.android.compileSdk.get().toInt()
     defaultConfig {
         minSdk = libs.versions.android.minSdk.get().toInt()
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    externalNativeBuild {
+        cmake {
+            path("src/commonMain/cpp/CMakeLists.txt")
+            version = "3.22.1"
+        }
+    }
+
+    dependencies {
+        testImplementation(libs.junit)
+        androidTestImplementation(libs.ext.junit)
+        androidTestImplementation(libs.espresso.core)
     }
 }
 
 mavenPublishing {
 
     group = "io.github.plumsoftware"
-    version = "1.1.0"
+    version = "1.1.1"
 
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
 

gradle/libs.versions.toml

@@ -0,0 +1,47 @@
+package more.math.native.model
+
+@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+internal actual class NativeProvider actual constructor() {
+
+    companion object {
+        init {
+            System.loadLibrary("nativelib")
+        }
+    }
+
+    private external fun cppFactorial(number: Int) : Long
+
+    private external fun cppLongFactorial(number: Long) : Long
+
+    private external fun cppAverage(vararg number: Int) : Double
+
+    private external fun cppStandardDeviation(vararg numbers: Double) : Double
+
+    private external fun cppTetraction(number: Double, other: Int) : Double
+
+    private external fun cppGcd(a: Int, b: Int) : Int
+
+    actual fun nativeFactorial(number: Int): Long {
+        return cppFactorial(number = number)
+    }
+
+    actual fun nativeFactorial(number: Long): Long {
+        return cppLongFactorial(number = number)
+    }
+
+    actual fun nativeAverage(vararg numbers: Int) : Double {
+        return cppAverage(*numbers)
+    }
+
+    actual fun standardDeviation(vararg numbers: Double) : Double {
+        return cppStandardDeviation(*numbers)
+    }
+
+    actual fun tetraction(number: Double, other: Int) : Double {
+        return cppTetraction(number = number, other = other)
+    }
+
+    actual fun gcd(a: Int, b: Int): Int {
+        return cppGcd(a, b)
+    }
+}

library/build.gradle.kts

@@ -0,0 +1,49 @@
+package more.math.native.model
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import more.math.MoreMath
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.Assert.*
+
+@RunWith(AndroidJUnit4::class)
+class NativeLibTest {
+
+    @Test
+    fun nativeFactorial() {
+        val actual = MoreMath.factorial(n = 3)
+        val expected = 6L
+        assertEquals(expected, actual)
+
+        val actual1 = MoreMath.factorial(n = 3L)
+        val expected1 = 6L
+        assertEquals(expected1, actual1)
+    }
+
+    @Test
+    fun average() {
+        val exp: Double = 2.0
+        val act: Double = MoreMath.average(1, 2, 3)
+        assertEquals(exp.toString(), act.toString())
+    }
+
+    @Test
+    fun tetraction() {
+        val result = MoreMath.tetraction(number = 2.0, other = 3)
+        assertEquals(16.0.toString(), result.toString())
+    }
+
+    @Test
+    fun stdDev() {
+        val exp: Double = 1.0
+        val act: Double = MoreMath.standardDeviation(1.0, 2.0, 3.0)
+        assertEquals(exp.toString(), act.toString())
+    }
+
+    @Test
+    fun gcd() {
+        val exp: Int = 5
+        val act: Int = MoreMath.gcd(10, 15)
+        assertEquals(exp, act)
+    }
+}