Skip to content

Commit 8f0944c

Browse files
rasbtrasbt
committed
added conversion to float
1 parent ed0eb89 commit 8f0944c

3 files changed

Lines changed: 48 additions & 47 deletions

File tree

‎Data/test.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name,column1,column2,column3
22
abc,1.1,4.2,1.2
33
def,2.1,1.4,5.2
4-
ghi,1.5,1.2,2.1
5-
jkl,1.8,1.1,4.2
4+
ghi,1.5,1.2,-2.1
5+
jkl,1.8,-1.1,4.2
66
mno,9.4,6.6,6.2
77
pqr,1.4,8.3,8.4

‎Data/test_marked.csv‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name,column1,column2,column3
2-
abc,1.1^,4.2,1.2^
2+
abc,1.1*,4.2,1.2
33
def,2.1,1.4,5.2
4-
ghi,1.5,1.2,2.1
5-
jkl,1.8,1.1^,4.2
6-
mno,9.4*,6.6,6.2
7-
pqr,1.4,8.3*,8.4*
4+
ghi,1.5,1.2,-2.1*
5+
jkl,1.8,-1.1*,4.2
6+
mno,9.4,6.6,6.2
7+
pqr,1.4,8.3,8.4

‎tutorials/sorting_csvs.ipynb‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"metadata": {
33
"name": "",
4-
"signature": "sha256:13c10e46fea51bcbbf203261897bb4d8ea2087e39925e077d452778f78d62b1e"
4+
"signature": "sha256:7ce6d9e0e1dc3da5c31fc5f3a5ab7687870a76cd4adaedd6da95bc6451755b12"
55
},
66
"nbformat": 3,
77
"nbformat_minor": 0,
@@ -141,7 +141,7 @@
141141
"language": "python",
142142
"metadata": {},
143143
"outputs": [],
144-
"prompt_number": 4
144+
"prompt_number": 1
145145
},
146146
{
147147
"cell_type": "code",
@@ -167,7 +167,7 @@
167167
]
168168
}
169169
],
170-
"prompt_number": 5
170+
"prompt_number": 2
171171
},
172172
{
173173
"cell_type": "markdown",
@@ -207,13 +207,14 @@
207207
" \"\"\" Prints CSV file to standard output.\"\"\"\n",
208208
" print(50*'-')\n",
209209
" for row in csv_content:\n",
210+
" row = [str(e) for e in row]\n",
210211
" print('\\t'.join(row))\n",
211212
" print(50*'-')"
212213
],
213214
"language": "python",
214215
"metadata": {},
215216
"outputs": [],
216-
"prompt_number": 6
217+
"prompt_number": 3
217218
},
218219
{
219220
"cell_type": "code",
@@ -238,15 +239,15 @@
238239
"name\tcolumn1\tcolumn2\tcolumn3\n",
239240
"abc\t1.1\t4.2\t1.2\n",
240241
"def\t2.1\t1.4\t5.2\n",
241-
"ghi\t1.5\t1.2\t2.1\n",
242-
"jkl\t1.8\t1.1\t4.2\n",
242+
"ghi\t1.5\t1.2\t-2.1\n",
243+
"jkl\t1.8\t-1.1\t4.2\n",
243244
"mno\t9.4\t6.6\t6.2\n",
244245
"pqr\t1.4\t8.3\t8.4\n",
245246
"--------------------------------------------------\n"
246247
]
247248
}
248249
],
249-
"prompt_number": 7
250+
"prompt_number": 4
250251
},
251252
{
252253
"cell_type": "markdown",
@@ -291,7 +292,7 @@
291292
"language": "python",
292293
"metadata": {},
293294
"outputs": [],
294-
"prompt_number": 8
295+
"prompt_number": 5
295296
},
296297
{
297298
"cell_type": "code",
@@ -310,12 +311,12 @@
310311
"text": [
311312
"first 3 rows:\n",
312313
"['name', 'column1', 'column2', 'column3']\n",
313-
"['abc', 1.1, 4.2, 1.2]\n",
314-
"['def', 2.1, 1.4, 5.2]\n"
314+
"['abc', '1.1', '4.2', '1.2']\n",
315+
"['def', '2.1', '1.4', '5.2']\n"
315316
]
316317
}
317318
],
318-
"prompt_number": 9
319+
"prompt_number": 6
319320
},
320321
{
321322
"cell_type": "markdown",
@@ -374,7 +375,7 @@
374375
"language": "python",
375376
"metadata": {},
376377
"outputs": [],
377-
"prompt_number": 10
378+
"prompt_number": 7
378379
},
379380
{
380381
"cell_type": "markdown",
@@ -393,6 +394,7 @@
393394
"print_csv(csv_cont)\n",
394395
"\n",
395396
"print('\\n\\nCSV sorted by column \"column3\":')\n",
397+
"convert_cells_to_floats(csv_cont)\n",
396398
"csv_sorted = sort_by_column(csv_cont, 'column3')\n",
397399
"print_csv(csv_sorted)"
398400
],
@@ -410,8 +412,8 @@
410412
"name\tcolumn1\tcolumn2\tcolumn3\n",
411413
"abc\t1.1\t4.2\t1.2\n",
412414
"def\t2.1\t1.4\t5.2\n",
413-
"ghi\t1.5\t1.2\t2.1\n",
414-
"jkl\t1.8\t1.1\t4.2\n",
415+
"ghi\t1.5\t1.2\t-2.1\n",
416+
"jkl\t1.8\t-1.1\t4.2\n",
415417
"mno\t9.4\t6.6\t6.2\n",
416418
"pqr\t1.4\t8.3\t8.4\n",
417419
"--------------------------------------------------\n",
@@ -420,17 +422,17 @@
420422
"CSV sorted by column \"column3\":\n",
421423
"--------------------------------------------------\n",
422424
"name\tcolumn1\tcolumn2\tcolumn3\n",
425+
"ghi\t1.5\t1.2\t-2.1\n",
423426
"abc\t1.1\t4.2\t1.2\n",
424-
"ghi\t1.5\t1.2\t2.1\n",
425-
"jkl\t1.8\t1.1\t4.2\n",
427+
"jkl\t1.8\t-1.1\t4.2\n",
426428
"def\t2.1\t1.4\t5.2\n",
427429
"mno\t9.4\t6.6\t6.2\n",
428430
"pqr\t1.4\t8.3\t8.4\n",
429431
"--------------------------------------------------\n"
430432
]
431433
}
432434
],
433-
"prompt_number": 11
435+
"prompt_number": 8
434436
},
435437
{
436438
"cell_type": "markdown",
@@ -489,13 +491,13 @@
489491
" col_index = sorted_csv[0].index(col)\n",
490492
" else:\n",
491493
" col_index = col\n",
492-
" sorted_csv[1][col_index] += marker\n",
494+
" sorted_csv[1][col_index] = str(sorted_csv[1][col_index]) + marker\n",
493495
" return None"
494496
],
495497
"language": "python",
496498
"metadata": {},
497499
"outputs": [],
498-
"prompt_number": 12
500+
"prompt_number": 9
499501
},
500502
{
501503
"cell_type": "code",
@@ -509,29 +511,29 @@
509511
" (modifies input CSV content list).\n",
510512
" \n",
511513
" \"\"\"\n",
512-
" for c in csv_cont[0][1:]:\n",
514+
" for c in range(1, len(csv_cont[0])):\n",
513515
" mark_minmax(csv_cont, c, mark_max, marker)\n",
514516
" marked_csv = sort_by_column(csv_cont, 0, False)\n",
515517
" return marked_csv"
516518
],
517519
"language": "python",
518520
"metadata": {},
519521
"outputs": [],
520-
"prompt_number": 13
522+
"prompt_number": 10
521523
},
522524
{
523525
"cell_type": "code",
524526
"collapsed": false,
525527
"input": [
526528
"import copy\n",
529+
"\n",
527530
"csv_cont = csv_to_list('../Data/test.csv')\n",
528531
"\n",
529532
"csv_marked = copy.deepcopy(csv_cont)\n",
530-
"mark_all_col(csv_marked, mark_max=True, marker='*')\n",
531-
"mark_all_col(csv_marked, mark_max=False, marker='^')\n",
533+
"convert_cells_to_floats(csv_marked)\n",
534+
"mark_all_col(csv_marked, mark_max=False, marker='*')\n",
532535
"print_csv(csv_marked)\n",
533-
"\n",
534-
"print('^: min-value\\n*: max-value')"
536+
"print('*: min-value')"
535537
],
536538
"language": "python",
537539
"metadata": {},
@@ -542,19 +544,18 @@
542544
"text": [
543545
"--------------------------------------------------\n",
544546
"name\tcolumn1\tcolumn2\tcolumn3\n",
545-
"abc\t1.1^\t4.2\t1.2^\n",
547+
"abc\t1.1*\t4.2\t1.2\n",
546548
"def\t2.1\t1.4\t5.2\n",
547-
"ghi\t1.5\t1.2\t2.1\n",
548-
"jkl\t1.8\t1.1^\t4.2\n",
549-
"mno\t9.4*\t6.6\t6.2\n",
550-
"pqr\t1.4\t8.3*\t8.4*\n",
549+
"ghi\t1.5\t1.2\t-2.1*\n",
550+
"jkl\t1.8\t-1.1*\t4.2\n",
551+
"mno\t9.4\t6.6\t6.2\n",
552+
"pqr\t1.4\t8.3\t8.4\n",
551553
"--------------------------------------------------\n",
552-
"^: min-value\n",
553-
"*: max-value\n"
554+
"*: min-value\n"
554555
]
555556
}
556557
],
557-
"prompt_number": 14
558+
"prompt_number": 12
558559
},
559560
{
560561
"cell_type": "markdown",
@@ -603,7 +604,7 @@
603604
"language": "python",
604605
"metadata": {},
605606
"outputs": [],
606-
"prompt_number": 15
607+
"prompt_number": 13
607608
},
608609
{
609610
"cell_type": "markdown",
@@ -633,17 +634,17 @@
633634
"Written CSV file:\n",
634635
"--------------------------------------------------\n",
635636
"name\tcolumn1\tcolumn2\tcolumn3\n",
636-
"abc\t1.1^\t4.2\t1.2^\n",
637+
"abc\t1.1*\t4.2\t1.2\n",
637638
"def\t2.1\t1.4\t5.2\n",
638-
"ghi\t1.5\t1.2\t2.1\n",
639-
"jkl\t1.8\t1.1^\t4.2\n",
640-
"mno\t9.4*\t6.6\t6.2\n",
641-
"pqr\t1.4\t8.3*\t8.4*\n",
639+
"ghi\t1.5\t1.2\t-2.1*\n",
640+
"jkl\t1.8\t-1.1*\t4.2\n",
641+
"mno\t9.4\t6.6\t6.2\n",
642+
"pqr\t1.4\t8.3\t8.4\n",
642643
"--------------------------------------------------\n"
643644
]
644645
}
645646
],
646-
"prompt_number": 16
647+
"prompt_number": 14
647648
},
648649
{
649650
"cell_type": "code",

0 commit comments

Comments
 (0)