From f7fc327e8c72cb6eb05665ad2f694a23f45388ee Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Thu, 7 Jan 2021 18:28:51 +0700 Subject: [PATCH] Reformat generated APIs --- .../kmath/gsl/codegen/matricesCodegen.kt | 9 +-- .../kmath/gsl/codegen/vectorsCodegen.kt | 4 +- .../kotlin/kscience/kmath/gsl/GslComplex.kt | 10 +++- .../kotlin/kscience/kmath/gsl/_Matrices.kt | 56 +++++++++++++------ .../kotlin/kscience/kmath/gsl/_Vectors.kt | 32 ++++++++--- 5 files changed, 79 insertions(+), 32 deletions(-) diff --git a/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/matricesCodegen.kt b/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/matricesCodegen.kt index 84391181c..668ecb625 100644 --- a/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/matricesCodegen.kt +++ b/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/matricesCodegen.kt @@ -33,9 +33,8 @@ private fun KtPsiFactory.createMatrixClass( override fun suggestFeature(vararg features: MatrixFeature): $className = ${className}(nativeHandleChecked(), this.features + features, scope) - override operator fun get(i: Int, j: Int): $kotlinTypeName = ${ - fn("gsl_matrixRget", cTypeName) - }(nativeHandleChecked(), i.toULong(), j.toULong()) + override operator fun get(i: Int, j: Int): $kotlinTypeName = + ${fn("gsl_matrixRget", cTypeName)}(nativeHandleChecked(), i.toULong(), j.toULong()) override operator fun set(i: Int, j: Int, value: ${kotlinTypeName}): Unit = ${fn("gsl_matrixRset", cTypeName)}(nativeHandleChecked(), i.toULong(), j.toULong(), value) @@ -49,9 +48,11 @@ private fun KtPsiFactory.createMatrixClass( override fun close(): Unit = ${fn("gsl_matrixRfree", cTypeName)}(nativeHandleChecked()) override fun equals(other: Any?): Boolean { - if (other is $className) return ${ + if (other is $className) + return ${ fn("gsl_matrixRequal", cTypeName) }(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + return super.equals(other) } }""" diff --git a/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/vectorsCodegen.kt b/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/vectorsCodegen.kt index 2139489d1..4a903d9a7 100644 --- a/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/vectorsCodegen.kt +++ b/buildSrc/src/main/kotlin/kscience/kmath/gsl/codegen/vectorsCodegen.kt @@ -38,10 +38,12 @@ private fun KtPsiFactory.createVectorClass( } override fun equals(other: Any?): Boolean { - if (other is $className) return ${ + if (other is $className) + return ${ fn("gsl_vectorRequal", cTypeName) }(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + return super.equals(other) } diff --git a/kmath-gsl/src/nativeMain/kotlin/kscience/kmath/gsl/GslComplex.kt b/kmath-gsl/src/nativeMain/kotlin/kscience/kmath/gsl/GslComplex.kt index 6706bc535..3041ad718 100644 --- a/kmath-gsl/src/nativeMain/kotlin/kscience/kmath/gsl/GslComplex.kt +++ b/kmath-gsl/src/nativeMain/kotlin/kscience/kmath/gsl/GslComplex.kt @@ -15,7 +15,7 @@ internal fun Complex.toGsl(): CValue = cValue { internal class GslComplexMatrix( override val nativeHandle: CPointer, features: Set = emptySet(), - scope: DeferScope + scope: DeferScope, ) : GslMatrix(scope) { override val rowNum: Int get() = nativeHandleChecked().pointed.size1.toInt() @@ -43,7 +43,9 @@ internal class GslComplexMatrix( override fun close(): Unit = gsl_matrix_complex_free(nativeHandleChecked()) override fun equals(other: Any?): Boolean { - if (other is GslComplexMatrix) return gsl_matrix_complex_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + if (other is GslComplexMatrix) + return gsl_matrix_complex_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + return super.equals(other) } } @@ -65,7 +67,9 @@ internal class GslComplexVector(override val nativeHandle: CPointer, sc } override fun equals(other: Any?): Boolean { - if (other is GslRealVector) return gsl_vector_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + if (other is GslRealVector) + return gsl_vector_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + return super.equals(other) } @@ -40,7 +42,9 @@ internal class GslFloatVector(override val nativeHandle: CPointer, } override fun equals(other: Any?): Boolean { - if (other is GslIntVector) return gsl_vector_int_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + if (other is GslIntVector) + return gsl_vector_int_equal(nativeHandleChecked(), other.nativeHandleChecked()) == 1 + return super.equals(other) } @@ -172,7 +186,9 @@ internal class GslUIntVector(override val nativeHandle: CPointer