Skip to content

Commit

Permalink
fix #6706 by just deleting semicolons (#6707)
Browse files Browse the repository at this point in the history
* fix #6706 by just deleting semicolons

* remove outputs
  • Loading branch information
scottdraves authored Jan 24, 2018
1 parent ab94835 commit 81f749f
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 54 deletions.
4 changes: 1 addition & 3 deletions doc/groovy/TableAPI.ipynb
Original file line number Diff line number Diff line change
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
48 changes: 23 additions & 25 deletions doc/python/ChartingAPI.ipynb
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": [
"from beakerx import *\n",
Expand Down Expand Up @@ -138,7 +136,7 @@
"metadata": {},
"outputs": [],
"source": [
"plot = Plot();\n",
"plot = Plot()\n",
"y1 = [1.5, 1, 6, 5, 2, 8]\n",
"cs = [Color.black, Color.red, Color.gray, Color.green, Color.blue, Color.pink]\n",
"ss = [StrokeType.SOLID, StrokeType.SOLID, StrokeType.DASH, StrokeType.DOT, StrokeType.DASHDOT, StrokeType.LONGDASH]\n",
Expand Down Expand Up @@ -480,12 +478,12 @@
"\n",
"millis = current_milli_time()\n",
"\n",
"hour = round(1000 * 60 * 60);\n",
"xs = [];\n",
"ys = [];\n",
"hour = round(1000 * 60 * 60)\n",
"xs = []\n",
"ys = []\n",
"for i in range(11):\n",
" xs.append(millis + hour * i);\n",
" ys.append(i);\n",
" xs.append(millis + hour * i)\n",
" ys.append(i)\n",
"\n",
"plot = TimePlot(timeZone=\"America/New_York\")\n",
"# list of milliseconds\n",
Expand Down Expand Up @@ -618,7 +616,7 @@
"ys = []\n",
"for i in range(11):\n",
" xs.append(nanos + 7 * i)\n",
" ys.append(i);\n",
" ys.append(i)\n",
"\n",
"nanoplot = NanoPlot()\n",
"nanoplot.add(Points(x=xs, y=ys))"
Expand Down Expand Up @@ -737,25 +735,25 @@
"outputs": [],
"source": [
"import math\n",
"points = 100;\n",
"logBase = 10;\n",
"expys = [];\n",
"xs = [];\n",
"points = 100\n",
"logBase = 10\n",
"expys = []\n",
"xs = []\n",
"for i in range(0, points):\n",
" xs.append(i / 15.0)\n",
" expys.append(math.exp(xs[i]))\n",
"\n",
"\n",
"cplot = CombinedPlot(xLabel= \"Linear\");\n",
"logYPlot = Plot(title= \"Linear x, Log y\", yLabel= \"Log\", logY= True, yLogBase= logBase);\n",
"logYPlot.add(Line(x= xs, y= expys, displayName= \"f(x) = exp(x)\"));\n",
"logYPlot.add(Line(x= xs, y= xs, displayName= \"g(x) = x\"));\n",
"cplot.add(logYPlot, 4);\n",
"cplot = CombinedPlot(xLabel= \"Linear\")\n",
"logYPlot = Plot(title= \"Linear x, Log y\", yLabel= \"Log\", logY= True, yLogBase= logBase)\n",
"logYPlot.add(Line(x= xs, y= expys, displayName= \"f(x) = exp(x)\"))\n",
"logYPlot.add(Line(x= xs, y= xs, displayName= \"g(x) = x\"))\n",
"cplot.add(logYPlot, 4)\n",
"\n",
"linearYPlot = Plot(title= \"Linear x, Linear y\", yLabel= \"Linear\");\n",
"linearYPlot.add(Line(x= xs, y= expys, displayName= \"f(x) = exp(x)\"));\n",
"linearYPlot.add(Line(x= xs, y= xs, displayName= \"g(x) = x\"));\n",
"cplot.add(linearYPlot,4);\n",
"linearYPlot = Plot(title= \"Linear x, Linear y\", yLabel= \"Linear\")\n",
"linearYPlot.add(Line(x= xs, y= expys, displayName= \"f(x) = exp(x)\"))\n",
"linearYPlot.add(Line(x= xs, y= xs, displayName= \"g(x) = x\"))\n",
"cplot.add(linearYPlot,4)\n",
"\n",
"cplot\n"
]
Expand All @@ -767,7 +765,7 @@
"outputs": [],
"source": [
"plot = Plot(title= \"Log x, Log y\", xLabel= \"Log\", yLabel= \"Log\",\n",
" logX= True, xLogBase= logBase, logY= True, yLogBase= logBase);\n",
" logX= True, xLogBase= logBase, logY= True, yLogBase= logBase)\n",
"\n",
"plot.add(Line(x= xs, y= expys, displayName= \"f(x) = exp(x)\"))\n",
"plot.add(Line(x= xs, y= xs, displayName= \"f(x) = x\"))\n",
Expand All @@ -792,7 +790,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.4"
"version": "3.6.2"
}
},
"nbformat": 4,
Expand Down
42 changes: 16 additions & 26 deletions doc/python/Treemap.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"from beakerx import *\n",
Expand All @@ -22,34 +20,32 @@
"\n",
" return tooltip\n",
" \n",
"toolTipBuilder = ToolTipBuilder(); "
"toolTipBuilder = ToolTipBuilder()"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"from beakerx import *\n",
"node = TreeMapNode(\"0\");\n",
"node00 = TreeMapNode(\"00\", 2, DefaultValue(2));\n",
"node = TreeMapNode(\"0\")\n",
"node00 = TreeMapNode(\"00\", 2, DefaultValue(2))\n",
"\n",
"node01 = TreeMapNode(\"01\");\n",
"node01 = TreeMapNode(\"01\")\n",
"node01.add(TreeMapNode(\"011\", 1, DefaultValue(1)))\n",
"node01.add(TreeMapNode(\"012\", 2, DefaultValue(1)))\n",
"node01.add(TreeMapNode(\"013\", 3, DefaultValue(1)))\n",
"\n",
"node02 = TreeMapNode(\"02\");\n",
"node02 = TreeMapNode(\"02\")\n",
"node02.add(TreeMapNode(\"020\", 2, DefaultValue(2)))\n",
"node02.add(TreeMapNode(\"021\", 1, DefaultValue(1)))\n",
"node02.add(TreeMapNode(\"022\", 1, DefaultValue(1)))\n",
"node02.add(TreeMapNode(\"023\", 1, DefaultValue(1)))\n",
"node02.add(TreeMapNode(\"024\", 2, DefaultValue(2)))\n",
"\n",
"node03 = TreeMapNode(\"03\");\n",
"node03 = TreeMapNode(\"03\")\n",
"node03.add(TreeMapNode(\"030\", 1, DefaultValue(2)))\n",
"node03.add(TreeMapNode(\"031\", 2, DefaultValue(2)))\n",
"node03.add(TreeMapNode(\"032\", 3, DefaultValue(2)))\n",
Expand All @@ -66,9 +62,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"big_node = TreeMapNode(\"root\")\n",
Expand All @@ -95,16 +89,14 @@
"nodeY.add(nodeY1)\n",
"\n",
"\n",
"big_node.add(nodeY);\n",
"big_node.add(nodeX);"
"big_node.add(nodeY)\n",
"big_node.add(nodeX)"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"import json\n",
Expand All @@ -126,7 +118,7 @@
" process(node, treeNode)\n",
"\n",
"\n",
"real_node = TreeMapNode(\"root\");\n",
"real_node = TreeMapNode(\"root\")\n",
"\n",
"\n",
"process(aa, real_node)"
Expand Down Expand Up @@ -451,7 +443,7 @@
" root= node,\n",
" toolTipBuilder= toolTipBuilder,\n",
" title= \"GradientColorProvider with overrides colours\"\n",
");\n",
")\n",
"x.setColorProvider(GradientColorProvider(x, Color.LIGHT_GRAY, Color.DARK_GRAY))\n",
"x"
]
Expand Down Expand Up @@ -526,9 +518,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": []
}
Expand All @@ -549,7 +539,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.4"
"version": "3.6.2"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 81f749f

Please sign in to comment.