Skip to content

Commit a9b7689

Browse files
JohnMountJohnMount
committed
finish example
1 parent a5f175f commit a9b7689

File tree

5 files changed

+46
-43
lines changed

5 files changed

+46
-43
lines changed

‎Examples/cdata/ranking_pivot_example.ipynb‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
}
1313
},
1414
"source": [
15+
"# Ordered Grouping Example\n",
1516
"\n",
1617
"## Introduction\n",
1718
"\n",
@@ -757,94 +758,94 @@
757758
" <th></th>\n",
758759
" <th>DATE2</th>\n",
759760
" <th>OP2</th>\n",
761+
" <th>OP1</th>\n",
760762
" <th>OP3</th>\n",
761-
" <th>DATE3</th>\n",
762763
" <th>ID</th>\n",
763-
" <th>OP1</th>\n",
764764
" <th>DATE1</th>\n",
765+
" <th>DATE3</th>\n",
765766
" </tr>\n",
766767
" </thead>\n",
767768
" <tbody>\n",
768769
" <tr>\n",
769770
" <th>0</th>\n",
770771
" <td>2015-04-25 00:00:00</td>\n",
771772
" <td>B</td>\n",
772-
" <td>None</td>\n",
773+
" <td>A</td>\n",
773774
" <td>None</td>\n",
774775
" <td>1</td>\n",
775-
" <td>A</td>\n",
776776
" <td>2001-01-02 00:00:00</td>\n",
777+
" <td>None</td>\n",
777778
" </tr>\n",
778779
" <tr>\n",
779780
" <th>1</th>\n",
780781
" <td>None</td>\n",
781782
" <td>None</td>\n",
782-
" <td>None</td>\n",
783+
" <td>A</td>\n",
783784
" <td>None</td>\n",
784785
" <td>2</td>\n",
785-
" <td>A</td>\n",
786786
" <td>2000-04-01 00:00:00</td>\n",
787+
" <td>None</td>\n",
787788
" </tr>\n",
788789
" <tr>\n",
789790
" <th>2</th>\n",
790791
" <td>None</td>\n",
791792
" <td>None</td>\n",
792-
" <td>None</td>\n",
793+
" <td>D</td>\n",
793794
" <td>None</td>\n",
794795
" <td>3</td>\n",
795-
" <td>D</td>\n",
796796
" <td>2014-04-07 00:00:00</td>\n",
797+
" <td>None</td>\n",
797798
" </tr>\n",
798799
" <tr>\n",
799800
" <th>3</th>\n",
800801
" <td>2009-01-20 00:00:00</td>\n",
801802
" <td>B, D</td>\n",
803+
" <td>A</td>\n",
802804
" <td>C</td>\n",
803-
" <td>2012-12-01 00:00:00</td>\n",
804805
" <td>4</td>\n",
805-
" <td>A</td>\n",
806806
" <td>2005-06-16 00:00:00</td>\n",
807+
" <td>2012-12-01 00:00:00</td>\n",
807808
" </tr>\n",
808809
" <tr>\n",
809810
" <th>4</th>\n",
810811
" <td>2010-10-10 00:00:00</td>\n",
811812
" <td>A</td>\n",
812-
" <td>None</td>\n",
813+
" <td>B</td>\n",
813814
" <td>None</td>\n",
814815
" <td>5</td>\n",
815-
" <td>B</td>\n",
816816
" <td>2003-11-09 00:00:00</td>\n",
817+
" <td>None</td>\n",
817818
" </tr>\n",
818819
" <tr>\n",
819820
" <th>5</th>\n",
820821
" <td>None</td>\n",
821822
" <td>None</td>\n",
822-
" <td>None</td>\n",
823+
" <td>B</td>\n",
823824
" <td>None</td>\n",
824825
" <td>6</td>\n",
825-
" <td>B</td>\n",
826826
" <td>2004-01-09 00:00:00</td>\n",
827+
" <td>None</td>\n",
827828
" </tr>\n",
828829
" </tbody>\n",
829830
"</table>\n",
830831
"</div>"
831832
],
832833
"text/plain": [
833-
" DATE2 OP2 OP3 DATE3 ID OP1 \\\n",
834-
"0 2015-04-25 00:00:00 B None None 1 A \n",
835-
"1 None None None None 2 A \n",
836-
"2 None None None None 3 D \n",
837-
"3 2009-01-20 00:00:00 B, D C 2012-12-01 00:00:00 4 A \n",
838-
"4 2010-10-10 00:00:00 A None None 5 B \n",
839-
"5 None None None None 6 B \n",
834+
" DATE2 OP2 OP1 OP3 ID DATE1 \\\n",
835+
"0 2015-04-25 00:00:00 B A None 1 2001-01-02 00:00:00 \n",
836+
"1 None None A None 2 2000-04-01 00:00:00 \n",
837+
"2 None None D None 3 2014-04-07 00:00:00 \n",
838+
"3 2009-01-20 00:00:00 B, D A C 4 2005-06-16 00:00:00 \n",
839+
"4 2010-10-10 00:00:00 A B None 5 2003-11-09 00:00:00 \n",
840+
"5 None None B None 6 2004-01-09 00:00:00 \n",
840841
"\n",
841-
" DATE1 \n",
842-
"0 2001-01-02 00:00:00 \n",
843-
"1 2000-04-01 00:00:00 \n",
844-
"2 2014-04-07 00:00:00 \n",
845-
"3 2005-06-16 00:00:00 \n",
846-
"4 2003-11-09 00:00:00 \n",
847-
"5 2004-01-09 00:00:00 "
842+
" DATE3 \n",
843+
"0 None \n",
844+
"1 None \n",
845+
"2 None \n",
846+
"3 2012-12-01 00:00:00 \n",
847+
"4 None \n",
848+
"5 None "
848849
]
849850
},
850851
"execution_count": 9,

‎Examples/cdata/ranking_pivot_example.md‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Ordered Grouping Example
2+
13
## Introduction
24

35
I'd like to share an example of data-wrangling/data-reshaping and how to solve it in [`Python`](https://www.python.org)/[`Pandas`](https://pandas.pydata.org) using [`data_algebra`](https://github.com/WinVector/data_algebra) (the `R` version of this example can be found [`here`](https://github.com/WinVector/cdata/blob/master/Examples/OrderedGrouping/OrderedGrouping.md)).
@@ -553,73 +555,73 @@ res_db
553555
<th></th>
554556
<th>DATE2</th>
555557
<th>OP2</th>
558+
<th>OP1</th>
556559
<th>OP3</th>
557-
<th>DATE3</th>
558560
<th>ID</th>
559-
<th>OP1</th>
560561
<th>DATE1</th>
562+
<th>DATE3</th>
561563
</tr>
562564
</thead>
563565
<tbody>
564566
<tr>
565567
<th>0</th>
566568
<td>2015-04-25 00:00:00</td>
567569
<td>B</td>
568-
<td>None</td>
570+
<td>A</td>
569571
<td>None</td>
570572
<td>1</td>
571-
<td>A</td>
572573
<td>2001-01-02 00:00:00</td>
574+
<td>None</td>
573575
</tr>
574576
<tr>
575577
<th>1</th>
576578
<td>None</td>
577579
<td>None</td>
578-
<td>None</td>
580+
<td>A</td>
579581
<td>None</td>
580582
<td>2</td>
581-
<td>A</td>
582583
<td>2000-04-01 00:00:00</td>
584+
<td>None</td>
583585
</tr>
584586
<tr>
585587
<th>2</th>
586588
<td>None</td>
587589
<td>None</td>
588-
<td>None</td>
590+
<td>D</td>
589591
<td>None</td>
590592
<td>3</td>
591-
<td>D</td>
592593
<td>2014-04-07 00:00:00</td>
594+
<td>None</td>
593595
</tr>
594596
<tr>
595597
<th>3</th>
596598
<td>2009-01-20 00:00:00</td>
597599
<td>B, D</td>
600+
<td>A</td>
598601
<td>C</td>
599-
<td>2012-12-01 00:00:00</td>
600602
<td>4</td>
601-
<td>A</td>
602603
<td>2005-06-16 00:00:00</td>
604+
<td>2012-12-01 00:00:00</td>
603605
</tr>
604606
<tr>
605607
<th>4</th>
606608
<td>2010-10-10 00:00:00</td>
607609
<td>A</td>
608-
<td>None</td>
610+
<td>B</td>
609611
<td>None</td>
610612
<td>5</td>
611-
<td>B</td>
612613
<td>2003-11-09 00:00:00</td>
614+
<td>None</td>
613615
</tr>
614616
<tr>
615617
<th>5</th>
616618
<td>None</td>
617619
<td>None</td>
618-
<td>None</td>
620+
<td>B</td>
619621
<td>None</td>
620622
<td>6</td>
621-
<td>B</td>
622623
<td>2004-01-09 00:00:00</td>
624+
<td>None</td>
623625
</tr>
624626
</tbody>
625627
</table>

‎coverage.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ data_algebra/yaml.py 95 11 88%
8585
TOTAL 4036 918 77%
8686

8787

88-
============================== 89 passed in 8.20s ==============================
88+
============================== 89 passed in 9.27s ==============================

‎dist/data_algebra-0.4.5-py3-none-any.whl‎

0 Bytes
Binary file not shown.

‎dist/data_algebra-0.4.5.tar.gz‎

-6 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)