Skip to content

Commit

Permalink
misc changes (mostly cosmetic)
Browse files Browse the repository at this point in the history
  • Loading branch information
whym committed Oct 28, 2024
1 parent 9666d06 commit c2fcf9c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ project/metals.sbt
.metals
.bsp
.idea
.prj/
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This software was in part used for a research paper presented in PACLIC 2014: *_

=== How to use

_https://www.scala-sbt.org/[sbt] and Java Development Kit (JDK) are required both for building and using this application_. Latest release is built with sbt 1.8.2 and openjdk 11.0.21.
_https://www.scala-sbt.org/[sbt] and Java Development Kit (JDK) are required both for building and using this application_. Latest release is built with sbt 1.10.0 and openjdk 21.0.3.

This application has a number of parameters that are set by a configuration file (or by Java properties). See `src/main/resources/reference.conf` for the default values and `.conf` files at the top level of the repository for other examples.`

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ enablePlugins(TomcatPlugin)
lazy val root = (project in file(".")).
enablePlugins(BuildInfoPlugin).
settings(
scalaVersion := "3.3.0",
scalaVersion := "3.4.2",
organization := "org.whym",
name := "growthring",
version := "0.7-SNAPSHOT",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.2
sbt.version=1.10.0
6 changes: 2 additions & 4 deletions src/main/scala/org/whym/growthring/ExtremalSubstrings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ object ExtremalSubstrings {
}

def roundMax(x: (Int, Int)): (Int, Int) =
((x._1 - (x._1 & 1)) / 2,
x._2 / 2)
((x._1 - (x._1 & 1)) / 2, x._2 / 2)

def roundMin(x: (Int, Int)): (Int, Int) =
((x._1 + (x._1 & 1)) / 2,
(x._2 - ((x._2 + 1) & 1)) / 2)
((x._1 + (x._1 & 1)) / 2, (x._2 - ((x._2 + 1) & 1)) / 2)

// def slidingMinimums(n: Int, arr: IndexedSeq[Int]): IndexedSeq[Int] = {
// (0 until (arr.size - n + 1)).map{i => arr.slice(i, i+n).min}
Expand Down

0 comments on commit c2fcf9c

Please sign in to comment.