From 0d9385db978318c7006f2e06ed6a131feeb3f8a5 Mon Sep 17 00:00:00 2001 From: Brian Wignall Date: Mon, 8 Jul 2024 09:04:20 -0400 Subject: [PATCH 1/2] Fix typos --- math/src/main/codegen/breeze/linalg/CanPad.scala | 2 +- math/src/main/scala/breeze/io/RandomAccessFile.scala | 2 +- math/src/main/scala/breeze/linalg/SliceUtils.scala | 2 +- math/src/main/scala/breeze/optimize/LBFGSB.scala | 2 +- math/src/main/scala/breeze/optimize/StrongWolfe.scala | 4 ++-- .../scala/breeze/optimize/proximal/NonlinearMinimizer.scala | 2 +- math/src/main/scala/breeze/signal/JavaCompatible.scala | 4 ++-- math/src/main/scala/breeze/util/Index.scala | 4 ++-- math/src/main/scala/breeze/util/IsomorphismIndex.scala | 2 +- math/src/test/scala/breeze/linalg/DenseMatrixTest.scala | 2 +- math/src/test/scala/breeze/linalg/DenseVectorTest.scala | 4 ++-- project/Build.scala | 2 +- viz/src/main/scala/breeze/plot/PaintScale.scala | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/math/src/main/codegen/breeze/linalg/CanPad.scala b/math/src/main/codegen/breeze/linalg/CanPad.scala index b4bbe5cfc..e9c24da5e 100644 --- a/math/src/main/codegen/breeze/linalg/CanPad.scala +++ b/math/src/main/codegen/breeze/linalg/CanPad.scala @@ -50,7 +50,7 @@ object CanPadRight { v.length match { case optDim.n1 => v.copy case num: Int if num < optDim.n1 => DenseVector(v.toArray ++ Array.tabulate(optDim.n1 - num)(p => padValue)) - //ToDo 4: DenseVector.vertcat does not work due to implict problems + //ToDo 4: DenseVector.vertcat does not work due to implicit problems //case num: Int if num < optDim.n1 => DenseVector.vertcat( v, DenseVector.tabulate(optDim.n1 - num)(p => padValue) ) case num: Int if optDim.n1 < num => v(0 until optDim.n1).copy //function should return a copy case _ => throw new IllegalArgumentException("(n) specification incorrect: " + optDim.toString + " !") diff --git a/math/src/main/scala/breeze/io/RandomAccessFile.scala b/math/src/main/scala/breeze/io/RandomAccessFile.scala index a5d6acd0f..999609192 100644 --- a/math/src/main/scala/breeze/io/RandomAccessFile.scala +++ b/math/src/main/scala/breeze/io/RandomAccessFile.scala @@ -43,7 +43,7 @@ import spire.math.ULong * both positive and negative values of Int64 (this is compatible with + and -, for use as timestamps, for example, * but is of course not compatible with * and / operations) * - * *implementation note: this class was not overriden from java.io.RandomAccessFile or implicitly "pimped," but instead + * *implementation note: this class was not overridden from java.io.RandomAccessFile or implicitly "pimped," but instead * passes through to java.io.RandomAccessFile. This is mainly because the java.io.RandomAccessFile.readXXX functions are * declared final, and cannot be overridden. */ diff --git a/math/src/main/scala/breeze/linalg/SliceUtils.scala b/math/src/main/scala/breeze/linalg/SliceUtils.scala index 70503eb64..3c3a6fc26 100644 --- a/math/src/main/scala/breeze/linalg/SliceUtils.scala +++ b/math/src/main/scala/breeze/linalg/SliceUtils.scala @@ -3,7 +3,7 @@ package breeze.linalg import scala.collection.immutable.IndexedSeq /** - * Utility class that handles negative row/column indicies and OOB checking + * Utility class that handles negative row/column indices and OOB checking * * @author Michael Petnuch */ diff --git a/math/src/main/scala/breeze/optimize/LBFGSB.scala b/math/src/main/scala/breeze/optimize/LBFGSB.scala index f7d6143c0..093cbede8 100644 --- a/math/src/main/scala/breeze/optimize/LBFGSB.scala +++ b/math/src/main/scala/breeze/optimize/LBFGSB.scala @@ -22,7 +22,7 @@ import breeze.util.SerializableLogging import breeze.macros._ /** - * This algorithm is refered the paper + * This algorithm is referred the paper * "A LIMITED MEMOR Y ALGORITHM F OR BOUND CONSTRAINED OPTIMIZA TION" written by * Richard H.Byrd   Peihuang Lu   Jorge Nocedal  and Ciyou Zhu * Created by fanming.chen on 2015/3/7 0007. diff --git a/math/src/main/scala/breeze/optimize/StrongWolfe.scala b/math/src/main/scala/breeze/optimize/StrongWolfe.scala index b281b8cd5..e795c7a97 100644 --- a/math/src/main/scala/breeze/optimize/StrongWolfe.scala +++ b/math/src/main/scala/breeze/optimize/StrongWolfe.scala @@ -184,7 +184,7 @@ class StrongWolfeLineSearch(maxZoomIter: Int, maxLineSearchIter: Int) extends Cu low = c if (t == bound) { logger.debug( - "Reach bound, satisfy sufficent decrease condition," + + "Reach bound, satisfy sufficient decrease condition," + " but not curvature condition satisfied.") return bound } else { @@ -192,7 +192,7 @@ class StrongWolfeLineSearch(maxZoomIter: Int, maxLineSearchIter: Int) extends Cu if (t > bound) { t = bound } - logger.debug("Sufficent Decrease condition but not curvature condition satisfied. Increased t to: " + t) + logger.debug("Sufficient Decrease condition but not curvature condition satisfied. Increased t to: " + t) } } } diff --git a/math/src/main/scala/breeze/optimize/proximal/NonlinearMinimizer.scala b/math/src/main/scala/breeze/optimize/proximal/NonlinearMinimizer.scala index fc012bd17..77e43ec55 100644 --- a/math/src/main/scala/breeze/optimize/proximal/NonlinearMinimizer.scala +++ b/math/src/main/scala/breeze/optimize/proximal/NonlinearMinimizer.scala @@ -254,7 +254,7 @@ object NonlinearMinimizer { if (args.length < 3) { println("Usage: ProjectedQuasiNewton n lambda beta") println( - "Test NonlinearMinimizer with a quadratic function of dimenion n and m equalities with lambda beta for elasticNet") + "Test NonlinearMinimizer with a quadratic function of dimension n and m equalities with lambda beta for elasticNet") sys.exit(1) } diff --git a/math/src/main/scala/breeze/signal/JavaCompatible.scala b/math/src/main/scala/breeze/signal/JavaCompatible.scala index b01e6cc18..e761b92cf 100644 --- a/math/src/main/scala/breeze/signal/JavaCompatible.scala +++ b/math/src/main/scala/breeze/signal/JavaCompatible.scala @@ -18,8 +18,8 @@ object JavaCompatible { // /**Returns the discrete fourier transform. - * Use fourierTrC instead for complex array imput. - * Use fourierTr2/2C instead for 2D Fourier tranform. + * Use fourierTrC instead for complex array input. + * Use fourierTr2/2C instead for 2D Fourier transform. * * * @return diff --git a/math/src/main/scala/breeze/util/Index.scala b/math/src/main/scala/breeze/util/Index.scala index 21c88687e..99460db74 100644 --- a/math/src/main/scala/breeze/util/Index.scala +++ b/math/src/main/scala/breeze/util/Index.scala @@ -63,7 +63,7 @@ trait Index[T] extends Iterable[T] with (T => Int) with Serializable { def indexOf(t: T): Int = apply(t) - /** Returns the indexed items along with their indicies */ + /** Returns the indexed items along with their indices */ def pairs: Iterator[(T, Int)] /** @@ -415,7 +415,7 @@ object EnumerationIndex { */ def unapply(i: Int): Option[t.Value] = Some[t.Value](t(i)) - /** Returns the indexed items along with their indicies */ + /** Returns the indexed items along with their indices */ def pairs: Iterator[(t.Value, Int)] = for (v <- t.values.iterator) yield v -> v.id def iterator: Iterator[t.Value] = t.values.iterator diff --git a/math/src/main/scala/breeze/util/IsomorphismIndex.scala b/math/src/main/scala/breeze/util/IsomorphismIndex.scala index 002e3a9c8..7ac7a6040 100644 --- a/math/src/main/scala/breeze/util/IsomorphismIndex.scala +++ b/math/src/main/scala/breeze/util/IsomorphismIndex.scala @@ -16,7 +16,7 @@ class IsomorphismIndex[T, U](val innerIndex: Index[T])(implicit iso: Isomorphism */ def unapply(i: Int): Option[U] = innerIndex.unapply(i).map(iso.forward) - /** Returns the indexed items along with their indicies */ + /** Returns the indexed items along with their indices */ def pairs: Iterator[(U, Int)] = innerIndex.pairs.map(pair => (iso.forward(pair._1), pair._2)) def iterator: Iterator[U] = innerIndex.iterator.map(iso.forward) diff --git a/math/src/test/scala/breeze/linalg/DenseMatrixTest.scala b/math/src/test/scala/breeze/linalg/DenseMatrixTest.scala index fcf735f62..e0d8047d7 100644 --- a/math/src/test/scala/breeze/linalg/DenseMatrixTest.scala +++ b/math/src/test/scala/breeze/linalg/DenseMatrixTest.scala @@ -111,7 +111,7 @@ class DenseMatrixTest extends AnyFunSuite with Checkers with DoubleImplicits wit test("Sliced Transpose") { val m = DenseMatrix((0, 1, 2), (3, 4, 5)) - // column of original looks same as row of tranpose + // column of original looks same as row of transpose val sm1 = m(::, 1) val smt1 = m.t(1, ::) assert(sm1.t === smt1) diff --git a/math/src/test/scala/breeze/linalg/DenseVectorTest.scala b/math/src/test/scala/breeze/linalg/DenseVectorTest.scala index d197bc87d..1a0bad5d1 100644 --- a/math/src/test/scala/breeze/linalg/DenseVectorTest.scala +++ b/math/src/test/scala/breeze/linalg/DenseVectorTest.scala @@ -351,7 +351,7 @@ class DenseVectorTest extends AnyFunSuite with Checkers { } - test("Negation Tranpose") { + test("Negation Transpose") { val a1 = DenseVector(1.0, 2.0, 3.0) assert(-a1.t == DenseVector(-1.0, -2.0, -3.0).t) @@ -456,7 +456,7 @@ class DenseVectorTest extends AnyFunSuite with Checkers { assert(dv === DenseVector(1, 1, 2, 3, 4, 5, 6, 7, 8, 8)) } - test("clip tranpose") { + test("clip transpose") { val dv = DenseVector.range(0, 10) assert(clip(dv.t, 1, 8) === DenseVector(1, 1, 2, 3, 4, 5, 6, 7, 8, 8).t) clip.inPlace(dv.t, 1, 8) diff --git a/project/Build.scala b/project/Build.scala index 45181c2a7..c0ebfb4fc 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -90,7 +90,7 @@ object Common { case _ => ??? } }, - // TODO: remove when possibl`e + // TODO: remove when possible`e // publishArtifact in (Compile, packageDoc) := { // CrossVersion.partialVersion(scalaVersion.value) match { // case Some( (3, _)) => false diff --git a/viz/src/main/scala/breeze/plot/PaintScale.scala b/viz/src/main/scala/breeze/plot/PaintScale.scala index 092504a3d..6ce060259 100644 --- a/viz/src/main/scala/breeze/plot/PaintScale.scala +++ b/viz/src/main/scala/breeze/plot/PaintScale.scala @@ -171,7 +171,7 @@ object PaintScale { } // - // A large pallete of color literals from ProtoVis + // A large palette of color literals from ProtoVis // val aliceblue = Color.decode("#f0f8ff") val antiquewhite = Color.decode("#faebd7") From 9dffce73fa26bdc3959ef4e7d31d8f57f643f2a9 Mon Sep 17 00:00:00 2001 From: Brian Wignall Date: Mon, 8 Jul 2024 09:05:34 -0400 Subject: [PATCH 2/2] Fix typo --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index c0ebfb4fc..e270423b8 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -90,7 +90,7 @@ object Common { case _ => ??? } }, - // TODO: remove when possible`e + // TODO: remove when possible // publishArtifact in (Compile, packageDoc) := { // CrossVersion.partialVersion(scalaVersion.value) match { // case Some( (3, _)) => false