Skip to content

Commit 7eb4ea8

Browse files
Debabrata AcharyaDebabrata Acharya
authored andcommitted
remove pandas dependency
1 parent 2345700 commit 7eb4ea8

File tree

7 files changed

+5942
-26
lines changed

7 files changed

+5942
-26
lines changed

csv_handler.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import copy
2+
import os
3+
from typing import List, Union
4+
15
import file
26
import model as m
37
import util as u
4-
from typing import List, Union
5-
import copy
6-
import os
78

89

910
def readcsv(filename: str, separator: str = ',', rstrip: bool = True) -> List[List[str]]:

data.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import csv_handler as csv
2-
import model as m
3-
from typing import List, Union, Tuple
41
import copy
2+
import os
3+
from typing import List
54
import anndata as ad
65
import scanpy as sc
7-
import pandas as pd
6+
import csv_handler as csv
7+
import model as m
88
import util as u
9-
import os
109

1110

1211
def build_model_from_csv(filename: str, separator: str = ',', rstrip: bool = True) -> m.DataMatrix:
@@ -48,7 +47,7 @@ def read_as_anndata(list_of_list: List[List[float]], roundoff_decimal: int = 5,
4847
list_of_list = [[u.roundoff(value, roundoff_decimal) for value in row] for row in list_of_list]
4948

5049
u.create_path_if_not_exists(temp_folder)
51-
pd.DataFrame(list_of_list).to_csv(complete_file_path, index=False, index_label=False, header=False)
50+
csv.writecsv(filename, list_of_list, directory=temp_folder)
5251

5352
return sc.read_csv(complete_file_path)
5453

datamatrix.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import copy
12
from typing import List, Union, Tuple
3+
24
from sample import Sample
3-
import copy
45

56

67
class DataMatrix:

preprocess.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1+
import copy
2+
import statistics as st
13
from typing import List, Tuple, Union
2-
import model
4+
import scanpy as sc
5+
import csv_handler as csv
36
import data
7+
import model
48
import normalization as nz
59
import util as u
6-
import statistics as st
7-
import copy
8-
import pandas as pd
9-
import scanpy as sc
10-
import anndata as ad
11-
import csv_handler as csv
12-
import os
1310

1411

1512
def filter_csv_by_sd(filename: str, attr_count: int, separator: str = ',', rstrip: bool = True) -> model.DataMatrix:
@@ -205,8 +202,10 @@ def filter_singlecells(datamatrix: model.DataMatrix, min_cells: int, min_genes:
205202

206203
datamatrix = filter_genes(datamatrix, min_genes=min_genes, roundoff_decimal=roundoff_decimal, filehash=filehash)
207204

205+
u.clear_temp()
206+
208207
return datamatrix
209208

210209

211-
def fsc(datamatrix: model.DataMatrix, min_cells: int, min_genes: int, rd: int = 5) -> model.DataMatrix:
212-
return filter_singlecells(datamatrix, min_cells, min_genes=min_genes, roundoff_decimal=rd)
210+
def fsc(datamatrix: model.DataMatrix, mc: int, mg: int, rd: int = 5) -> model.DataMatrix:
211+
return filter_singlecells(datamatrix, mc, mg, roundoff_decimal=rd)

sample.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import copy
12
from typing import List, Union
3+
24
from datapoint import DataPoint
3-
import copy
45

56

67
class Sample:

sample_datasets/bmmcaml-5898-1000.csv

Lines changed: 5899 additions & 0 deletions
Large diffs are not rendered by default.

util.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
from typing import List, Union
21
import copy
3-
import model as m
4-
import string
5-
import random
6-
import os
72
import math
3+
import os
4+
import random
5+
import string
6+
import glob
7+
from typing import List, Union
8+
9+
import model as m
810

911

1012
def hash(length=10) -> str:
@@ -103,3 +105,17 @@ def get_classlabeled_list_of_list_from_datamatrix(datamatrix: m.DataMatrix) -> L
103105

104106
def gclld(datamatrix: m.DataMatrix) -> List[List[Union[float, str]]]:
105107
return get_classlabeled_list_of_list_from_datamatrix(datamatrix)
108+
109+
110+
def clear_temp():
111+
112+
temp_folder: str = '__temp__'
113+
114+
if not is_valid_path(temp_folder):
115+
return
116+
117+
filelist = glob.glob(os.path.join(temp_folder, '*'))
118+
119+
for f in filelist:
120+
if is_valid_path(os.path.join(f)):
121+
os.remove(f)

0 commit comments

Comments
 (0)