Merge pull request #12 from Quafadas/main

Start of some docs. Some tests for gamma and log. Design notes tidy
dragonfly-ai · Sep 18, 2023 · db4402b · db4402b
2 parents bb9c2be + 26e2e13
commit db4402b
Show file tree

Hide file tree

Showing 57 changed files with 305 additions and 296 deletions.
diff --git a/demo/shared/src/main/scala/Demo.scala b/demo/shared/src/main/scala/Demo.scala
@@ -8,9 +8,9 @@ object Demo extends XApp(NativeConsole(style = "padding: 8px; overflow: scroll;"
 
   val allDemos: Array[Demonstration] = Array[Demonstration](
     // Math
-    ai.dragonfly.math.LogDemo,
-    ai.dragonfly.math.GammaDemo,
-    ai.dragonfly.math.FactorialDemo,
+    //ai.dragonfly.math.LogDemo,
+    //ai.dragonfly.math.GammaDemo,
+    //ai.dragonfly.math.FactorialDemo,
     // TODO: add Interval demo
     ai.dragonfly.math.unicode.UnicodeDemo,
     // Geometry:

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/BijectionDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/BijectionDemo.scala
@@ -3,8 +3,6 @@ package ai.dragonfly.math
 import ai.dragonfly.math
 import ai.dragonfly.democrossy.Demonstration
 
-import scala.reflect.ClassTag
-
 object BijectionDemo extends Demonstration {
 
   object H2O {

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/FactorialDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/FactorialDemo.scala
@@ -1,7 +1,6 @@
 package ai.dragonfly.math
 
 import ai.dragonfly.democrossy.Demonstration
-import ai.dragonfly.math.*
 import ai.dragonfly.math.Factorial.!
 import scala.language.postfixOps
 

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/geometry/TetrahedronDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/geometry/TetrahedronDemo.scala
@@ -1,12 +1,10 @@
 package ai.dragonfly.math.geometry
 
-import ai.dragonfly.math.stats.probability.distributions.Sampleable
-import ai.dragonfly.math.interval.*
-import Interval.*
+
 import ai.dragonfly.democrossy.Demonstration
 import ai.dragonfly.math.vector.*
 import Vec.*
-import ai.dragonfly.math.geometry.Tetrahedron
+
 
 object TetrahedronDemo extends Demonstration {
 

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoEigenDecomposition.scala b/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoEigenDecomposition.scala
@@ -1,7 +1,6 @@
 package ai.dragonfly.math.matrix
 
 import ai.dragonfly.democrossy.Demonstration
-import ai.dragonfly.math.matrix.Matrix
 import ai.dragonfly.math.matrix.decomposition.*
 import ai.dragonfly.math.vector.*
 import ai.dragonfly.math.vector.Vec.*

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoLinearRegression.scala b/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoLinearRegression.scala
@@ -6,10 +6,8 @@ import ai.dragonfly.math.matrix.ml.data.StaticSupervisedData
 import ai.dragonfly.math.matrix.ml.supervized.regression.{LinearRegressionQR, LinearRegressionSVD, *}
 import ai.dragonfly.math.vector.*
 import ai.dragonfly.math.vector.Vec.*
-import ai.dragonfly.math.vector.Vec2.*
 import ai.dragonfly.viz.cli.*
 import ai.dragonfly.math.interval.*
-import scala.compiletime.ops.int.*
 
 object DemoLinearRegression extends Demonstration {
 
@@ -60,7 +58,7 @@ object DemoLinearRegression extends Demonstration {
     val xSlopeSVD: Double = slrSVD(p + Vec[2](1.0, 0.0)) - yMean
     val ySlopeSVD: Double = slrSVD(p + Vec[2](0.0, 1.0)) - yMean
 
-    val c = yMean / slrSVD.a.magnitude
+    yMean / slrSVD.a.magnitude
     xPlot.line(Vec[2](p(0), yMean), xSlopeSVD, "SVD (p.x, f'(p))")
     yPlot.line(Vec[2](p(1), yMean), ySlopeSVD, "SVD (p.y, f'(p))")
 
@@ -73,7 +71,7 @@ object DemoLinearRegression extends Demonstration {
     val elrt: EmpiricalRegressionTest[100, 8] = EmpiricalRegressionTest[100, 8](empericalTrainingData, empericalTestData)
     val emProbLR: LinearRegressionProblem[100, 8] = LinearRegressionProblem[100, 8](empericalTrainingData)
 
-    val size: Double = empericalTrainingData.sampleSize
+    println(empericalTrainingData.sampleSize)
 
     println("\nTest LinearRegressionQR:\n")
     val elrQR = new LinearRegressionQR[100, 8].train(emProbLR)

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoPCA.scala b/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoPCA.scala
@@ -8,16 +8,12 @@ import ai.dragonfly.math.matrix.ml.data.*
 import ai.dragonfly.math.matrix.ml.unsupervised.dimreduction.PCA
 import ai.dragonfly.math.vector.*
 import ai.dragonfly.math.vector.Vec.*
-import ai.dragonfly.math.vector.Vec2.*
-import ai.dragonfly.math.interval
 import ai.dragonfly.viz.cli.CLImg
 
 import Console.*
 
 object DemoPCA extends Demonstration {
 
-  import interval.*
-
   def demo(): Unit = {
 
     // 2D shapes represented by centered 2D meshes of exactly 9 points each.

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoVectorInterop.scala b/demo/shared/src/main/scala/ai/dragonfly/math/matrix/DemoVectorInterop.scala
@@ -1,9 +1,7 @@
 package ai.dragonfly.math.matrix
 
 import ai.dragonfly.democrossy.Demonstration
-import ai.dragonfly.math.matrix.Matrix
 import ai.dragonfly.math.matrix.util.*
-import ai.dragonfly.math.matrix.decomposition.*
 import ai.dragonfly.math.vector.*
 import ai.dragonfly.math.vector.Vec.*
 import ai.dragonfly.math.vector.Vec2.*
@@ -15,7 +13,7 @@ object DemoVectorInterop extends Demonstration {
   def demo(): Unit = {
     val M0: Matrix[2, 3] = Matrix[2, 3](
       NArray[NArray[Double]](
-        NArray[Double](1.0, `𝜑`, `√2`),
+        NArray[Double](1.0, 1.46557123187676802665, `√2`),
         NArray[Double](2.0, π, e),
       )
     )

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/stats/kernel/KernelDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/stats/kernel/KernelDemo.scala
@@ -5,15 +5,11 @@ package ai.dragonfly.math.stats.kernel
  */
 
 import ai.dragonfly.math.*
-import Constant.{`√(2π)`, π}
 import ai.dragonfly.democrossy.Demonstration
 import ai.dragonfly.math.stats.DenseHistogramOfContinuousDistribution
 import ai.dragonfly.math.stats.probability.distributions.Gaussian
-import ai.dragonfly.math.vector.*
 import narr.*
 
-import scala.collection.mutable
-
 object KernelDemo extends Demonstration {
   override def demo():Unit = {
     val exclusionRadius:Double = 12.0

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/BetaDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/BetaDemo.scala
@@ -2,8 +2,6 @@ package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
 import stats.*
-import interval.*
-import Interval.*
 
 object BetaDemo {
   val demo2param = ProbDistDemo("Beta", Beta(0.5, 5.0), DenseHistogramOfContinuousDistribution(9, 0, 1))

diff --git a/...hared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/BinomialDemo.scala b/...hared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/BinomialDemo.scala
@@ -2,9 +2,8 @@ package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
 import stats.*
-import ai.dragonfly.math.Factorial.!
 import ai.dragonfly.math.interval.*
-import Interval.*
+
 
 import scala.language.postfixOps
 

diff --git a/...rc/main/scala/ai/dragonfly/math/stats/probability/distributions/DiscreteUniformDemo.scala b/...rc/main/scala/ai/dragonfly/math/stats/probability/distributions/DiscreteUniformDemo.scala
@@ -2,8 +2,6 @@ package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
 import stats.*
-import ai.dragonfly.math.interval.*
-import Interval.*
 
 import scala.language.postfixOps
 

diff --git a/...hared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/GaussianDemo.scala b/...hared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/GaussianDemo.scala
@@ -1,10 +1,8 @@
 package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
-import Constant.`√(2π)`
 import stats.*
-import ai.dragonfly.math.stats.probability.distributions.ProbabilityDistribution
-import interval.*
+
 
 
 object GaussianDemo {

diff --git a/...ared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/LogNormalDemo.scala b/...ared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/LogNormalDemo.scala
@@ -2,8 +2,6 @@ package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
 import stats.*
-import interval.*
-import Constant.π
 
 // https://en.wikipedia.org/wiki/Log-normal_distribution#Generation_and_parameters
 

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/PERTDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/PERTDemo.scala
@@ -1,11 +1,8 @@
 package ai.dragonfly.math.stats.probability.distributions
 
 
-import ai.dragonfly.math.{ProbDistDemo, Random}
+import ai.dragonfly.math.{ProbDistDemo}
 import ai.dragonfly.math.stats.*
-import ai.dragonfly.math.interval.*
-import Interval.*
-import ai.dragonfly.math.stats.BoundedMean
 
 object PERTDemo {
   val demo = ProbDistDemo("PERT", PERT(5.0, 6.0, 11.0), DenseHistogramOfContinuousDistribution(11, 5.0, 11.0))

diff --git a/...shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/PoissonDemo.scala b/...shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/PoissonDemo.scala
@@ -2,7 +2,6 @@ package ai.dragonfly.math.stats.probability.distributions
 
 import ai.dragonfly.math.*
 import stats.*
-import interval.*
 
 object PoissonDemo {
   val p15:Poisson = Poisson(15)

diff --git a/...shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/UniformDemo.scala b/...shared/src/main/scala/ai/dragonfly/math/stats/probability/distributions/UniformDemo.scala
@@ -3,9 +3,6 @@ package ai.dragonfly.math.stats.probability.distributions
 import ai.dragonfly.math.*
 
 import stats.*
-import ai.dragonfly.math.interval.*
-import Interval.*
-
 
 import scala.language.postfixOps
 

diff --git a/...rc/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/BinomialDemo.scala b/...rc/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/BinomialDemo.scala
@@ -2,10 +2,8 @@ package ai.dragonfly.math.stats.probability.distributions.stream
 
 import ai.dragonfly.math.stats.probability.distributions
 import ai.dragonfly.math.*
-import ai.dragonfly.math.interval.*
-import Interval.*
 import ai.dragonfly.democrossy.Demonstration
-import ai.dragonfly.math.stats.BoundedMean
+
 
 import scala.language.postfixOps
 import scala.language.implicitConversions

diff --git a/...c/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/LogNormalDemo.scala b/...c/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/LogNormalDemo.scala
@@ -1,10 +1,7 @@
 package ai.dragonfly.math.stats.probability.distributions.stream
 
 import ai.dragonfly.math.*
-import ai.dragonfly.math.interval.*
-import Interval.*
 import ai.dragonfly.math.stats.probability.distributions
-import ai.dragonfly.math.stats.PointStatistics
 
 
 object LogNormalDemo {

diff --git a/...ed/src/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/PERTDemo.scala b/...ed/src/main/scala/ai/dragonfly/math/stats/probability/distributions/stream/PERTDemo.scala
@@ -4,8 +4,6 @@ import ai.dragonfly.democrossy.Demonstration
 import ai.dragonfly.math.*
 import ai.dragonfly.math.stats.probability.distributions
 import ai.dragonfly.math.stats.probability.distributions.stream
-import ai.dragonfly.math.stats.probability.distributions.ProbabilityDistribution
-import ai.dragonfly.math.stats.BoundedMean
 
 
 object PERTDemo extends Demonstration {

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/vector/MixedVecDemo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/vector/MixedVecDemo.scala
@@ -4,7 +4,6 @@ import ai.dragonfly.democrossy.Demonstration
 import ai.dragonfly.math.*
 import ai.dragonfly.math.Random.*
 import ai.dragonfly.math.vector.Vec.*
-import ai.dragonfly.math.vector.Vec2.*
 import narr.*
 
 import scala.language.postfixOps

diff --git a/demo/shared/src/main/scala/ai/dragonfly/math/vector/Vec3Demo.scala b/demo/shared/src/main/scala/ai/dragonfly/math/vector/Vec3Demo.scala
@@ -1,7 +1,6 @@
 package ai.dragonfly.math.vector
 
 import ai.dragonfly.democrossy.Demonstration
-import ai.dragonfly.math.squareInPlace
 import narr.*
 import Vec.*
 

diff --git a/docs/demo/factorial.md b/docs/demo/factorial.md
@@ -0,0 +1,12 @@
+## Factorial
+
+Example
+
+```scala mdoc
+import scala.language.postfixOps // don't forget this import
+import ai.dragonfly.math.Factorial.!
+for (x:Int <- Seq(1, 2, 3, 4, 8, 16, 32, 64, 100)) {
+  println(s"${x}! = ${x!}")
+}
+
+```
diff --git a/docs/demo/logs.md b/docs/demo/logs.md
@@ -0,0 +1,22 @@
+## Logarithms
+
+Example
+
+```scala mdoc
+import ai.dragonfly.math.*
+import ai.dragonfly.math.Constant
+
+log[4](16)
+
+log[10](-1)
+
+log[2.7182818284590452](Constant.e)
+
+println( s"log[2.0](42.0) = ${log[2.0](42.0)}" )
+var i: Int = 1; while (i > 0) {
+  println( s"log[2]($i) = ${log[2](i)}" )
+  i = i << 1
+}
+
+
+```