Skip to content

Commit

Permalink
Fix for #30 FileReaderMetaData formatter index footer should span all…
Browse files Browse the repository at this point in the history
… columns

Updated to net8.0
  • Loading branch information
Paul Joiner committed Jan 9, 2024
1 parent a9903a6 commit 38e079f
Show file tree
Hide file tree
Showing 16 changed files with 196 additions and 225 deletions.
24 changes: 12 additions & 12 deletions notebooks/01_Introduction.ipynb
Expand Up @@ -35,13 +35,13 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"#r \"nuget:DwC-A_dotnet,0.7.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.10-Pre\""
"#r \"nuget:DwC-A_dotnet,0.8.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.11-Pre\""
]
},
{
Expand All @@ -62,7 +62,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -91,7 +91,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -107,7 +107,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -123,7 +123,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -148,7 +148,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -175,7 +175,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -207,7 +207,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -232,7 +232,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -256,7 +256,7 @@
" Count = g.Sum(c => int.Parse(c[Terms.individualCount])) \n",
" }); \n",
"\n",
"data"
"data.DisplayTable()"
]
}
],
Expand Down
19 changes: 10 additions & 9 deletions notebooks/02_Features.ipynb
Expand Up @@ -19,13 +19,13 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"#r \"nuget: DwC-A_dotnet, 0.7.0\"\n",
"#r \"nuget: DwC-A_dotnet.Interactive, 0.1.10-Pre\""
"#r \"nuget: DwC-A_dotnet, 0.8.0\"\n",
"#r \"nuget: DwC-A_dotnet.Interactive, 0.1.11-Pre\""
]
},
{
Expand All @@ -51,7 +51,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -88,7 +88,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -109,7 +109,7 @@
" longitude = o.Convert<double>(Terms.decimalLongitude),\n",
" date = o.Convert<DateTime>(Terms.eventDate),\n",
" issues = o.GetListOf(gbifIssue)\n",
" })"
" }).DisplayTable()"
]
},
{
Expand All @@ -129,13 +129,13 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"var occurrenceAsync = archive.GetAsyncCoreFile();\n",
"await occurrenceAsync.GetDataRowsAsync()\n",
"var occurrenceArray = await occurrenceAsync.GetDataRowsAsync()\n",
" .Take(10)\n",
" .Where(o => o[gbifIssue] is not null)\n",
" .Select(o => new {\n",
Expand All @@ -145,7 +145,8 @@
" longitude = o.Convert<double>(Terms.decimalLongitude),\n",
" date = o.Convert<DateTime>(Terms.eventDate),\n",
" issues = o.GetListOf(gbifIssue)\n",
" }).ToArrayAsync()"
" }).ToArrayAsync();\n",
"occurrenceArray.DisplayTable()"
]
}
],
Expand Down
28 changes: 14 additions & 14 deletions notebooks/03_Formatting.ipynb
Expand Up @@ -19,13 +19,13 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"#r \"nuget:DwC-A_dotnet,0.7.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.10-Pre\""
"#r \"nuget:DwC-A_dotnet,0.8.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.11-Pre\""
]
},
{
Expand All @@ -47,7 +47,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -67,7 +67,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -97,7 +97,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -131,7 +131,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -142,7 +142,7 @@
" .Select(n => new{\n",
" date = n[Terms.eventDate],\n",
" scientificName = new ScientificName(n[Terms.genus], n[Terms.specificEpithet])\n",
" })"
" }).DisplayTable()"
]
},
{
Expand All @@ -162,7 +162,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -179,7 +179,7 @@
" date = n[Terms.eventDate],\n",
" scientificName = new ScientificName(n[Terms.genus], n[Terms.specificEpithet]),\n",
" link = new Link(n[Terms.references])\n",
" })"
" }).DisplayTable()"
]
},
{
Expand All @@ -201,7 +201,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -232,7 +232,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -250,7 +250,7 @@
" image = new ImageUrl(m[identifier], o[Terms.scientificName])\n",
" }; \n",
"\n",
"media"
"media.DisplayTable()"
]
},
{
Expand All @@ -270,7 +270,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down
27 changes: 13 additions & 14 deletions notebooks/04_DataFrame.ipynb
Expand Up @@ -19,19 +19,18 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"#r \"nuget: Microsoft.DotNet.Interactive, 1.0.0-beta.21559.2\"\n",
"#r \"nuget: Microsoft.Dotnet.Interactive.http, 1.0.0-beta.21559.2\" \n",
"#r \"nuget: Microsoft.DotNet.Interactive.PowerShell, 1.0.0-beta.21559.2\"\n",
"#r \"nuget: XPlot.Plotly, 4.0.6\"\n",
"#r \"nuget: XPlot.Plotly.Interactive, 4.0.6\"\n",
"#r \"nuget: Microsoft.Data.Analysis, 0.19.0\"\n",
"#r \"nuget: DwC-A_dotnet, 0.7.0\"\n",
"#r \"nuget: DwC-a_dotnet.Interactive, 0.1.10-Pre\""
"#r \"nuget: Microsoft.DotNet.Interactive, 1.0.0-beta.23258.3\"\n",
"#r \"nuget: Microsoft.DotNet.Interactive.Formatting, 1.0.0-beta.23258.3\"\n",
"#r \"nuget: Microsoft.DotNet.Interactive.PowerShell, 1.0.0-beta.23258.3\"\n",
"#r \"nuget: XPlot.Plotly.Interactive, 4.0.7\"\n",
"#r \"nuget: Microsoft.Data.Analysis, 0.21.0\"\n",
"#r \"nuget: DwC-A_dotnet, 0.8.0\"\n",
"#r \"nuget: DwC-a_dotnet.Interactive, 0.1.11-Pre\""
]
},
{
Expand All @@ -51,7 +50,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -108,7 +107,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -143,7 +142,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down Expand Up @@ -185,7 +184,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -212,7 +211,7 @@
"language": "csharp"
},
"vscode": {
"languageId": "dotnet-interactive.csharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down
10 changes: 5 additions & 5 deletions notebooks/05_FSharp.ipynb
Expand Up @@ -21,16 +21,16 @@
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
"source": [
"#r \"nuget:Plotly.NET,3.0.1\"\n",
"#r \"nuget:Plotly.NET.Interactive,3.0.2\"\n",
"#r \"nuget:FSharp.Data,5.0.2\"\n",
"#r \"nuget:DwC-A_dotnet,0.7.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.10-Pre\""
"#r \"nuget:DwC-A_dotnet,0.8.0\"\n",
"#r \"nuget:DwC-A_dotnet.Interactive,0.1.11-Pre\""
]
},
{
Expand All @@ -41,7 +41,7 @@
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand All @@ -65,7 +65,7 @@
"language": "fsharp"
},
"vscode": {
"languageId": "dotnet-interactive.fsharp"
"languageId": "polyglot-notebook"
}
},
"outputs": [],
Expand Down

0 comments on commit 38e079f

Please sign in to comment.