Update deps, cleanup

julianpeeters · Mar 3, 2024 · c5921a7 · c5921a7
1 parent dc55d61
commit c5921a7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/build.sbt b/build.sbt
@@ -24,7 +24,7 @@ inThisBuild(List(
     "-Wvalue-discard",
     "-Ykind-projector:underscores"
   ),
-  scalaVersion := "3.3.1",
+  scalaVersion := "3.4.0",
   versionScheme := Some("semver-spec"),
 ))
 

diff --git a/docs/readme.md b/docs/readme.md
@@ -15,10 +15,6 @@ Based on the polynomial functors described in [Niu and Spivak](https://topos.sit
 
 ---
 
-### Modules
- - [`polynomial`](#polynomial-1): objects, morphisms, products
- - [`polynomial-mermaid`](#polynomial-mermaid): print mermaid chart definitions
-
 ### `polynomial`
 
 The `polynomial` library provides the following implementation of poly:

diff --git a/modules/poly/shared/src/main/scala/polynomial/morphism/PolyMap.scala b/modules/poly/shared/src/main/scala/polynomial/morphism/PolyMap.scala
@@ -37,7 +37,7 @@ object PolyMap:
     case (PolyMap[p, q, Y], Interface[a2, b2, Y])                         => Phi[p, Interface[a2, b2, _], Y]
     case (PolyMap[o, p, Y], Tensor[q, r, Y])                              => Phi[o, Tensor[q, r, _], Y]
     case (Store[s, Y], BiInterface[a1, b1, a2, b2, Y])                    => (s => b1, s => b2)
-    case (Store[s, Y], Interface[a, b, Y])                                => Tambara[s, b]
+    case (Store[s, Y], Interface[a, b, Y])                                => s => b
     case (Store[s, Y], Composition[p, q, Y])                              => (Phi[Store[s, _], p, Y], Phi[p, q, Y])
     case (Tensor[p, q, Y], Store[s1, Y])                                  => Phi[Tensor.DayConvolution[p, q, _], Store[s1, _], Y]
     case (Tensor[p, q, Y], Interface[a1, b1, Y])                          => Phi[Tensor.DayConvolution[p, q, _], Interface[a1, b1, _], Y]
@@ -50,20 +50,12 @@ object PolyMap:
     case (Interface[a1, b1, Y], BiInterface[a2, b2, a3, b3, Y])           => ((b1, a2) => a1, (b1, a3) => a1)
     case (Interface[a1, b1, Y], Interface[a2, b2, Y])                     => (b1, a2) => a1
     case (Store[s, Y], BiInterface[a1, b1, a2, b2, Y])                    => ((s, a1) => s, (s, a2) => s)
-    case (Store[s, Y], Interface[a, b, Y])                                => TambaraSharp[s, a]
+    case (Store[s, Y], Interface[a, b, Y])                                => (s, a) => s
     case (Store[s, Y], Composition[p, q, Y])                              => (s, Composition.DecomposeSharp[p, q, Y]) => s
     case (PolyMap[p, q, Y], BiInterface[a3, b3, a4, b4, Y])               => PhiSharp[p, BiInterface[a3, b3, a4, b4, _], Y]
     case (PolyMap[p, q, Y], Interface[a2, b2, Y])                         => PhiSharp[p, Interface[a2, b2, _], Y]
     case (PolyMap[o, p, Y], Tensor[q, r, Y])                              => PhiSharp[o, Tensor[q, r, _], Y]
     case (Tensor[p, q, Y], BiInterface[a1, b1, a2, b2, Y])                => PhiSharp[Tensor.DayConvolution[p, q, _], BiInterface[a1, b1, a2, b2, _], Y]
     case (Tensor[p, q, Y], Interface[a1, b1, Y])                          => PhiSharp[Tensor.DayConvolution[p, q, _], Interface[a1, b1, _], Y]
     case (Tensor[p, q, Y], Store[s1, Y])                                  => PhiSharp[Tensor.DayConvolution[p, q, _], Store[s1, _], Y]
-    case (Tensor[o, p, Y], Tensor[q, r, Y])                               => PhiSharp[Tensor.DayConvolution[o, p, _], Tensor.DayConvolution[q, r, _], Y]
-
-  type Tambara[S, B] = (S, B) match
-    case (Id[s], Id[b])         => s => b
-    case (Option[s], Id[b])     => Option[s] => b
-    case (Option[s], Option[b]) => Option[s] => Option[b]
-
-  type TambaraSharp[S, A] = (S, A) match
-    case (Id[s], A) => (s, A) => s 
+    case (Tensor[o, p, Y], Tensor[q, r, Y])                               => PhiSharp[Tensor.DayConvolution[o, p, _], Tensor.DayConvolution[q, r, _], Y]
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
 // cross
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.15.0")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.17")
 
 // docs
 addSbtPlugin("org.scalameta"      % "sbt-mdoc"                      % "2.5.2")
 
 // publish
 addSbtPlugin("com.github.sbt"     % "sbt-ci-release"                % "1.5.12")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel-no-publish"      % "0.6.2")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel-no-publish"      % "0.6.6")