Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#6705 CsvPlotReader renamed to CSV #6709

Merged
merged 1 commit into from
Jan 24, 2018
Merged

#6705 CsvPlotReader renamed to CSV #6709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions doc/groovy/BigTable.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"metadata": {},
"outputs": [],
"source": [
"display = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"display = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display"
]
},
Expand All @@ -78,24 +78,11 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {},
"outputs": [
{
"data": {
"application/vnd.jupyter.widget-view+json": {
"model_id": "d5f491d4-13f8-41e1-b7ba-4d6070cef000",
"version_major": 2,
"version_minor": 0
},
"method": "display_data"
},
"metadata": {},
"output_type": "display_data"
}
],
"outputs": [],
"source": [
"display = new TableDisplay(new CsvPlotReader().read(\"../resources/data/long_lines.csv\"))\n",
"display = new TableDisplay(new CSV().read(\"../resources/data/long_lines.csv\"))\n",
"display"
]
},
Expand Down
2 changes: 1 addition & 1 deletion doc/groovy/Charting.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"metadata": {},
"outputs": [],
"source": [
"rates = new CsvPlotReader().read(\"../resources/data/interest-rates.csv\")\n",
"rates = new CSV().read(\"../resources/data/interest-rates.csv\")\n",
"def f = new java.text.SimpleDateFormat(\"yyyy MM dd\")\n",
"lehmanDate = f.parse(\"2008 09 15\")\n",
"bubbleBottomDate = f.parse(\"2002 10 09\")\n",
Expand Down
14 changes: 4 additions & 10 deletions doc/groovy/OutputContainers.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"// something we don't want to see\n",
Expand Down Expand Up @@ -52,12 +50,10 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"def rates = new CsvPlotReader().read(\"../resources/data/interest-rates.csv\")\n",
"def rates = new CSV().read(\"../resources/data/interest-rates.csv\")\n",
"def c = new Color(120, 120, 120, 100)\n",
"plot1 = new Plot(initWidth: 300, initHeight: 400) \\\n",
" << new Points(x:rates.y1, y:rates.y30, size: 3, displayName:\"y1 vs y30\") \\\n",
Expand All @@ -74,9 +70,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": []
},
Expand Down
4 changes: 2 additions & 2 deletions doc/groovy/PlotFeatures.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,8 +490,8 @@
"metadata": {},
"outputs": [],
"source": [
"import com.twosigma.beakerx.fileloader.CsvPlotReader\n",
"rates = new CsvPlotReader().read(\"../resources/data/interest-rates.csv\")\n",
"import com.twosigma.beakerx.fileloader.CSV\n",
"rates = new CSV().read(\"../resources/data/interest-rates.csv\")\n",
"def size = rates.size()\n",
"(0 ..< size).each{row = rates[it]; row.spread = row.y10 - row.m3}"
]
Expand Down
18 changes: 8 additions & 10 deletions doc/groovy/TableAPI.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"metadata": {},
"outputs": [],
"source": [
"new TableDisplay( new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))"
"new TableDisplay( new CSV().read(\"../resources/data/interest-rates.csv\"))"
]
},
{
Expand All @@ -31,7 +31,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.format.TableDisplayStringFormat\n",
"\n",
"display = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"display = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"//show all time columns in days\n",
"display.setStringFormatForTimes(TimeUnit.DAYS)\n",
"//min 4, max 6 decimal places for all doubles\n",
Expand Down Expand Up @@ -79,7 +79,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.renderer.TableDisplayCellRenderer\n",
"\n",
"def display2 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display2 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"//right now, the only renderer option is for data bars\n",
"display2.setRendererForType(ColumnType.Double, TableDisplayCellRenderer.getDataBarsRenderer())\n",
"//use the false parameter to hide the String value\n",
Expand All @@ -94,10 +94,10 @@
"outputs": [],
"source": [
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.fileloader.CsvPlotReader\n",
"import com.twosigma.beakerx.fileloader.CSV\n",
"import com.twosigma.beakerx.table.format.TableDisplayStringFormat\n",
"\n",
"def display3 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display3 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display3.setStringFormatForType(ColumnType.Double, TableDisplayStringFormat.getDecimalFormat(9,9))\n",
"//freeze a column\n",
"display3.setColumnFrozen(\"y1\", true)\n",
Expand All @@ -120,7 +120,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.highlight.TableDisplayCellHighlighter\n",
"\n",
"def display4 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display4 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display4.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m3\", TableDisplayCellHighlighter.FULL_ROW))\n",
"\n",
"//the following two overloads should also be supported\n",
Expand Down Expand Up @@ -161,7 +161,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.highlight.*\n",
"\n",
"display6 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"display6 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display6.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m3\", 0, 8, Color.ORANGE, Color.PINK))\n",
"display6.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m6\", TableDisplayCellHighlighter.SINGLE_COLUMN, 6, 8, Color.BLACK, Color.PINK))\n",
"\n",
Expand Down Expand Up @@ -296,9 +296,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"abc = 0; // test variable\n",
Expand Down
14 changes: 7 additions & 7 deletions doc/nbviewer/TableApi.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
],
"source": [
"new TableDisplay( new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))"
"new TableDisplay( new CSV().read(\"../resources/data/interest-rates.csv\"))"
]
},
{
Expand All @@ -54,7 +54,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.format.TableDisplayStringFormat\n",
"\n",
"display = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"display = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"//show all time columns in days\n",
"display.setStringFormatForTimes(TimeUnit.DAYS)\n",
"//min 4, max 6 decimal places for all doubles\n",
Expand Down Expand Up @@ -126,7 +126,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.renderer.TableDisplayCellRenderer\n",
"\n",
"def display2 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display2 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"//right now, the only renderer option is for data bars\n",
"display2.setRendererForType(ColumnType.Double, TableDisplayCellRenderer.getDataBarsRenderer())\n",
"//use the false parameter to hide the String value\n",
Expand Down Expand Up @@ -154,10 +154,10 @@
],
"source": [
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.fileloader.CsvPlotReader\n",
"import com.twosigma.beakerx.fileloader.CSV\n",
"import com.twosigma.beakerx.table.format.TableDisplayStringFormat\n",
"\n",
"def display3 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display3 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display3.setStringFormatForType(ColumnType.Double, TableDisplayStringFormat.getDecimalFormat(9,9))\n",
"//freeze a column\n",
"display3.setColumnFrozen(\"y1\", true)\n",
Expand Down Expand Up @@ -193,7 +193,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.highlight.TableDisplayCellHighlighter\n",
"\n",
"def display4 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"def display4 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display4.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m3\", TableDisplayCellHighlighter.FULL_ROW))\n",
"\n",
"//the following two overloads should also be supported\n",
Expand Down Expand Up @@ -260,7 +260,7 @@
"import com.twosigma.beakerx.table.*\n",
"import com.twosigma.beakerx.table.highlight.*\n",
"\n",
"display6 = new TableDisplay(new CsvPlotReader().read(\"../resources/data/interest-rates.csv\"))\n",
"display6 = new TableDisplay(new CSV().read(\"../resources/data/interest-rates.csv\"))\n",
"display6.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m3\", 0, 8, Color.ORANGE, Color.PINK))\n",
"display6.addCellHighlighter(TableDisplayCellHighlighter.getHeatmapHighlighter(\"m6\", TableDisplayCellHighlighter.SINGLE_COLUMN, 6, 8, Color.BLACK, Color.PINK))\n",
"\n",
Expand Down
Loading