Commit Graph

11 Commits

Author SHA1 Message Date
Iaroslav Postovalov
d7c28bfd0c
Fix problems related to merge 2021-02-07 02:45:35 +07:00
Iaroslav Postovalov
73969da969
Merge branch 'dev' into feature/quaternion
# Conflicts:
#	CHANGELOG.md
#	kmath-complex/src/commonMain/kotlin/kscience/kmath/complex/Complex.kt
2021-02-07 02:31:54 +07:00
Iaroslav Postovalov
5f8054834a
Comment out incorrect tests 2021-02-07 02:26:25 +07:00
Iaroslav Postovalov
cd439ce2ed
Minor: regenerate README files 2021-01-31 14:40:03 +07:00
Iaroslav Postovalov
4f78286756
Fix after-merge problems 2021-01-30 17:19:46 +07:00
Iaroslav Postovalov
70c0b614a3
Merge branch 'dev' into feature/quaternion
# Conflicts:
#	CHANGELOG.md
#	examples/src/main/kotlin/kscience/kmath/operations/ComplexDemo.kt
#	examples/src/main/kotlin/kscience/kmath/structures/ComplexND.kt
#	kmath-complex/src/commonMain/kotlin/kscience/kmath/complex/ComplexNDField.kt
#	kmath-core/src/commonMain/kotlin/kscience/kmath/structures/NDAlgebra.kt
#	kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NDFieldTest.kt
2021-01-29 17:00:57 +07:00
Iaroslav Postovalov
2d1d6c008e
Fix after-merge problems 2021-01-20 15:07:12 +07:00
Iaroslav Postovalov
94a6d5a114
Fix after-merge problems 2021-01-20 14:56:09 +07:00
Iaroslav Postovalov
9748e0bfbe
Merge branch 'dev' into feature/quaternion
# Conflicts:
#	CHANGELOG.md
#	examples/src/main/kotlin/kscience/kmath/stat/DistributionBenchmark.kt
#	kmath-complex/src/commonMain/kotlin/kscience/kmath/complex/ComplexNDField.kt
#	kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Complex.kt
#	kmath-core/src/commonTest/kotlin/kscience/kmath/structures/NDFieldTest.kt
2021-01-20 01:10:31 +07:00
Iaroslav Postovalov
ae126d36c8
Update readmes for Complex, minor update of build-script 2021-01-06 21:06:57 +07:00
Iaroslav Postovalov
acf9dd2b6a
Extract complex and quaternion systems to another module 2021-01-06 21:01:37 +07:00