dataframe-viz 1.2.0.0 → 1.3.0.0
raw patch · 3 files changed
+5/−8 lines, 3 filesdep ~dataframe-corePVP ok
version bump matches the API change (PVP)
Dependency ranges changed: dataframe-core
API changes (from Hackage documentation)
- DataFrame.Display.Web.Chart.Typed: aggregateOn :: forall (cols :: [Type]). Channel -> Agg -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: aggregateOn :: forall (cols :: [(Symbol, Type)]). Channel -> Agg -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: bar :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: bar :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: binX :: forall (cols :: [Type]). Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: binX :: forall (cols :: [(Symbol, Type)]). Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: binY :: forall (cols :: [Type]). Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: binY :: forall (cols :: [(Symbol, Type)]). Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: box :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: box :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: chart :: forall (cols :: [Type]). TypedDataFrame cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: chart :: forall (cols :: [(Symbol, Type)]). TypedDataFrame cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: column :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: column :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: data Chart (cols :: [Type])
+ DataFrame.Display.Web.Chart.Typed: data Chart (cols :: [(Symbol, Type)])
- DataFrame.Display.Web.Chart.Typed: density :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: density :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: enc :: forall a (cols :: [Type]). Columnable a => Channel -> TExpr cols a -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: enc :: forall a (cols :: [(Symbol, Type)]). Columnable a => Channel -> TExpr cols a -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: encAs :: forall a (cols :: [Type]). Columnable a => Channel -> TExpr cols a -> FieldType -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: encAs :: forall a (cols :: [(Symbol, Type)]). Columnable a => Channel -> TExpr cols a -> FieldType -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: facet :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: facet :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: histogram :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: histogram :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: includeZero :: forall (cols :: [Type]). Channel -> Bool -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: includeZero :: forall (cols :: [(Symbol, Type)]). Channel -> Bool -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: layer :: forall (cols :: [Type]). [Chart cols] -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: layer :: forall (cols :: [(Symbol, Type)]). [Chart cols] -> Chart cols
- DataFrame.Display.Web.Chart.Typed: line :: forall a b (cols :: [Type]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: line :: forall a b (cols :: [(Symbol, Type)]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: logScale :: forall (cols :: [Type]). Channel -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: logScale :: forall (cols :: [(Symbol, Type)]). Channel -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: mark :: forall (cols :: [Type]). Mark -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: mark :: forall (cols :: [(Symbol, Type)]). Mark -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: pie :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: pie :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: regression :: forall a b (cols :: [Type]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: regression :: forall a b (cols :: [(Symbol, Type)]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: row :: forall a (cols :: [Type]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: row :: forall a (cols :: [(Symbol, Type)]). Columnable a => TExpr cols a -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: scatter :: forall a b (cols :: [Type]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> TypedDataFrame cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: scatter :: forall a b (cols :: [(Symbol, Type)]). (Columnable a, Columnable b) => TExpr cols a -> TExpr cols b -> TypedDataFrame cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: showChart :: forall (cols :: [Type]). Chart cols -> IO ()
+ DataFrame.Display.Web.Chart.Typed: showChart :: forall (cols :: [(Symbol, Type)]). Chart cols -> IO ()
- DataFrame.Display.Web.Chart.Typed: size :: forall (cols :: [Type]). Int -> Int -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: size :: forall (cols :: [(Symbol, Type)]). Int -> Int -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: title :: forall (cols :: [Type]). Text -> Chart cols -> Chart cols
+ DataFrame.Display.Web.Chart.Typed: title :: forall (cols :: [(Symbol, Type)]). Text -> Chart cols -> Chart cols
- DataFrame.Display.Web.Chart.Typed: toHtml :: forall (cols :: [Type]). Chart cols -> String
+ DataFrame.Display.Web.Chart.Typed: toHtml :: forall (cols :: [(Symbol, Type)]). Chart cols -> String
- DataFrame.Display.Web.Chart.Typed: toVegaSpec :: forall (cols :: [Type]). Chart cols -> Value
+ DataFrame.Display.Web.Chart.Typed: toVegaSpec :: forall (cols :: [(Symbol, Type)]). Chart cols -> Value
Files
- README.md +1/−1
- dataframe-viz.cabal +2/−2
- src/DataFrame/Display/Web/Chart/Typed.hs +2/−5
README.md view
@@ -270,7 +270,7 @@ box-and-whisker (quartiles, 1.5×IQR whiskers, outliers): ```haskell-type Cols = '[ Column "income" Double, Column "value" Double, Column "region" Text ]+type Cols = '[ '("income", Double), '("value", Double), '("region", Text)] case freeze @Cols df of Nothing -> "schema mismatch"
dataframe-viz.cabal view
@@ -1,6 +1,6 @@ cabal-version: 3.4 name: dataframe-viz-version: 1.2.0.0+version: 1.3.0.0 synopsis: Visualisation/plotting helpers for the dataframe ecosystem. description: Display harness plus terminal and web plotters. Built on top of@@ -37,7 +37,7 @@ build-depends: base >= 4 && < 5, aeson >= 0.11.0.0 && < 3, containers >= 0.6.7 && < 0.10,- dataframe-core >= 2.1 && < 2.2,+ dataframe-core >= 2.2 && < 2.3, directory >= 1.3.0.0 && < 2, granite >= 0.6 && < 1, process ^>= 1.6,
src/DataFrame/Display/Web/Chart/Typed.hs view
@@ -86,9 +86,10 @@ import qualified DataFrame.Display.Web.Chart as C import DataFrame.Internal.Column (Columnable) import DataFrame.Typed.Types (TExpr (..), TypedDataFrame (..))+import GHC.TypeLits (Symbol) -- | A typed chart: a phantom-@cols@ wrapper over the untyped builder.-newtype Chart (cols :: [Type]) = Chart C.Chart+newtype Chart (cols :: [(Symbol, Type)]) = Chart C.Chart -- | Start a typed chart from a typed frame. chart :: TypedDataFrame cols -> Chart cols@@ -167,10 +168,6 @@ -- | Render the chart to a temp file and open it in the default browser. showChart :: Chart cols -> IO () showChart (Chart c) = C.showChart c---- ------------------------------------------------------------------------------ One-shot convenience plots--- --------------------------------------------------------------------------- -- | Scatter plot of two typed expressions. scatter ::