re-run with in-package code

Author: JohnMount

Examples/cdata/cdata.html

@@ -13957,10 +13957,10 @@ <h2 id="Transforms-in-databases">Transforms in databases<a class="anchor-link" h
 <div class="inner_cell">
     <div class="input_area">
 <div class=" highlight hl-ipython3"><pre><span></span><span class="nb">print</span><span class="p">(</span><span class="n">db_model</span><span class="o">.</span><span class="n">row_recs_to_blocks_query</span><span class="p">(</span>
-    <span class="n">source_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_pandas_table</span><span class="p">(</span>
+    <span class="n">source_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_table</span><span class="p">(</span>
         <span class="n">iris</span><span class="p">,</span> <span class="s1">&#39;iris&#39;</span><span class="p">),</span>
     <span class="n">record_spec</span><span class="o">=</span><span class="n">record_spec</span><span class="p">,</span>
-    <span class="n">record_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_pandas_table</span><span class="p">(</span>
+    <span class="n">record_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_table</span><span class="p">(</span>
         <span class="n">record_spec</span><span class="o">.</span><span class="n">control_table</span><span class="p">,</span> <span class="s2">&quot;control_table&quot;</span><span class="p">)</span>
 <span class="p">))</span>
 </pre></div>
@@ -14009,7 +14009,7 @@ <h2 id="Transforms-in-databases">Transforms in databases<a class="anchor-link" h
 <div class="inner_cell">
     <div class="input_area">
 <div class=" highlight hl-ipython3"><pre><span></span><span class="nb">print</span><span class="p">(</span><span class="n">db_model</span><span class="o">.</span><span class="n">blocks_to_row_recs_query</span><span class="p">(</span>
-    <span class="n">source_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_pandas_table</span><span class="p">(</span>
+    <span class="n">source_view</span><span class="o">=</span><span class="n">data_algebra</span><span class="o">.</span><span class="n">data_ops</span><span class="o">.</span><span class="n">describe_table</span><span class="p">(</span>
         <span class="n">iris</span><span class="p">,</span> <span class="s1">&#39;iris&#39;</span><span class="p">),</span>
     <span class="n">record_spec</span><span class="o">=</span><span class="n">record_spec</span>
 <span class="p">))</span>
@@ -14120,8 +14120,6 @@ <h2 id="The-R-cdata-version">The R <code>cdata</code> version<a class="anchor-li
 <span class="c1"># install.packages(&quot;cdata&quot;)</span>
 <span class="nf">library</span><span class="p">(</span><span class="n">cdata</span><span class="p">)</span>
 <span class="nf">library</span><span class="p">(</span><span class="n">yaml</span><span class="p">)</span>
-<span class="c1"># https://github.com/WinVector/data_algebra/blob/master/Examples/cdata/cdata_yaml.R</span>
-<span class="nf">source</span><span class="p">(</span><span class="s">&quot;cdata_yaml.R&quot;</span><span class="p">)</span>
 
 <span class="n">iris</span> <span class="o">&lt;-</span> <span class="nf">read.csv</span><span class="p">(</span><span class="s">&#39;iris_small.csv&#39;</span><span class="p">)</span>
 <span class="nf">print</span><span class="p">(</span><span class="n">iris</span><span class="p">)</span>

Examples/cdata/cdata.ipynb

@@ -898,10 +898,10 @@
    ],
    "source": [
     "print(db_model.row_recs_to_blocks_query(\n",
-    "    source_view=data_algebra.data_ops.describe_pandas_table(\n",
+    "    source_view=data_algebra.data_ops.describe_table(\n",
     "        iris, 'iris'),\n",
     "    record_spec=record_spec,\n",
-    "    record_view=data_algebra.data_ops.describe_pandas_table(\n",
+    "    record_view=data_algebra.data_ops.describe_table(\n",
     "        record_spec.control_table, \"control_table\")\n",
     "))"
    ]
@@ -941,7 +941,7 @@
    ],
    "source": [
     "print(db_model.blocks_to_row_recs_query(\n",
-    "    source_view=data_algebra.data_ops.describe_pandas_table(\n",
+    "    source_view=data_algebra.data_ops.describe_table(\n",
     "        iris, 'iris'),\n",
     "    record_spec=record_spec\n",
     "))"
@@ -1050,11 +1050,9 @@
     "# install.packages(\"cdata\")\n",
     "library(cdata)\n",
     "library(yaml)\n",
-    "# https://github.com/WinVector/data_algebra/blob/master/Examples/cdata/cdata_yaml.R\n",
-    "source(\"cdata_yaml.R\")\n",
     "\n",
     "iris <- read.csv('iris_small.csv')\n",
-    "print(iris)\n"
+    "print(iris)"
    ]
   },
   {

Examples/cdata/cdata.md

@@ -629,10 +629,10 @@ db_model = data_algebra.SQLite.SQLiteModel()
 
 ```python
 print(db_model.row_recs_to_blocks_query(
-    source_view=data_algebra.data_ops.describe_pandas_table(
+    source_view=data_algebra.data_ops.describe_table(
         iris, 'iris'),
     record_spec=record_spec,
-    record_view=data_algebra.data_ops.describe_pandas_table(
+    record_view=data_algebra.data_ops.describe_table(
         record_spec.control_table, "control_table")
 ))
 ```
@@ -658,7 +658,7 @@ print(db_model.row_recs_to_blocks_query(
 
 ```python
 print(db_model.blocks_to_row_recs_query(
-    source_view=data_algebra.data_ops.describe_pandas_table(
+    source_view=data_algebra.data_ops.describe_table(
         iris, 'iris'),
     record_spec=record_spec
 ))
@@ -723,12 +723,9 @@ Now we we start up our R environment and read in the transform specification and
 # install.packages("cdata")
 library(cdata)
 library(yaml)
-# https://github.com/WinVector/data_algebra/blob/master/Examples/cdata/cdata_yaml.R
-source("cdata_yaml.R")
 
 iris <- read.csv('iris_small.csv')
 print(iris)
-
 ```
 
       Sepal.Length Sepal.Width Petal.Length Petal.Width Species id