kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

v0.2.0 #206

Merged
altavir merged 210 commits from dev into master 2021-02-21 16:33:25 +03:00
Conversation 0 Commits 210 Files Changed 284 +15 -13
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f6163698c - Show all commits

12
.github/workflows/gradle.yml vendored
View File

@ -29,10 +29,10 @@ jobs:
path: | path: |
~/.konan/dependencies ~/.konan/dependencies
~/.konan/kotlin-native-prebuilt-linux-1.4.20-eap-37 ~/.konan/kotlin-native-prebuilt-linux-1.4.20-eap-37
key: ${{ runner.os }}-konan-1.4.0 key: ${{ runner.os }}-konan-1.4.20-eap-37
restore-keys: ${{ runner.os }}-konan-1.4.0 restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew -Dorg.gradle.daemon=false --build-cache :kmath-gsl:cinteropLibgslNative build run: ./gradlew -Dorg.gradle.daemon=false --build-cache :kmath-gsl:cinteropLibgslLinuxX64 build
build-osx: build-osx:
runs-on: macos-latest runs-on: macos-latest
@ -59,7 +59,7 @@ jobs:
path: | path: |
~/.konan/dependencies ~/.konan/dependencies
~/.konan/kotlin-native-prebuilt-macos-1.4.20-eap-37 ~/.konan/kotlin-native-prebuilt-macos-1.4.20-eap-37
key: ${{ runner.os }}-konan-1.4.0 key: ${{ runner.os }}-konan-1.4.20-eap-37
restore-keys: ${{ runner.os }}-konan-1.4.0 restore-keys: ${{ runner.os }}-konan-1.4.20-eap-37
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew -Dorg.gradle.daemon=false --build-cache :kmath-gsl:cinteropLibgslNative build run: ./gradlew -Dorg.gradle.daemon=false --build-cache :kmath-gsl:cinteropLibgslMacosX64 build

6
gradle.properties
View File

@ -1,9 +1,7 @@
kotlin.code.style=official kotlin.code.style=official
kotlin.parallel.tasks.in.project=true
kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.mpp.stability.nowarn=true kotlin.mpp.stability.nowarn=true
kotlin.parallel.tasks.in.project=true
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
org.gradle.parallel=true org.gradle.parallel=true
systemProp.org.gradle.internal.publish.checksums.insecure=true systemProp.org.gradle.internal.publish.checksums.insecure=true

10
kmath-gsl/src/nativeMain/kotlin/kscience/kmath/gsl/GslRealMatrix.kt
View File

@ -12,7 +12,11 @@ import org.gnu.gsl.gsl_matrix_equal
import org.gnu.gsl.gsl_matrix_get import org.gnu.gsl.gsl_matrix_get
public sealed class GslMatrix<T : Any> : FeaturedMatrix<T> { public sealed class GslMatrix<T : Any> : FeaturedMatrix<T> {
public abstract val nativeHandle: CValues<out CStructVar> protected abstract val nativeHandle: CValues<out CStructVar>
override fun equals(other: Any?): Boolean {
return NDStructure.equals(this, other as? NDStructure<*> ?: return false)
}
public override fun hashCode(): Int { public override fun hashCode(): Int {
var result = nativeHandle.hashCode() var result = nativeHandle.hashCode()
@ -21,7 +25,7 @@ public sealed class GslMatrix<T : Any> : FeaturedMatrix<T> {
} }
} }
public class GslRealMatrix(public override val nativeHandle: CValues<gsl_matrix>, features: Set<MatrixFeature>) : public class GslRealMatrix(protected override val nativeHandle: CValues<gsl_matrix>, features: Set<MatrixFeature>) :
GslMatrix<Double>() { GslMatrix<Double>() {
public override val rowNum: Int public override val rowNum: Int
@ -42,6 +46,6 @@ public class GslRealMatrix(public override val nativeHandle: CValues<gsl_matrix>
public override fun equals(other: Any?): Boolean { public override fun equals(other: Any?): Boolean {
if (other is GslRealMatrix) gsl_matrix_equal(nativeHandle, other.nativeHandle) if (other is GslRealMatrix) gsl_matrix_equal(nativeHandle, other.nativeHandle)
return NDStructure.equals(this, other as? NDStructure<*> ?: return false) return super.equals(other)
} }
} }