Skip to content

Chore/fix minor #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gardenk11181 merged 2 commits into from
May 23, 2025
Merged

Chore/fix minor #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f443356
chore: fix typos and modify log format
gardenk11181 May 22, 2025
5cf553a
chore: modify some Docstring of functions
gardenk11181 May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions gaccord/gaccord.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def fit(self, X, y=None, initial=None):
)
if hist[-1][2] > self.epstol:
print(
'[WARNING]{datetime.now().strftime("[%Y-%m-%d %H:%M:%S]")} The result does not converge.'
f'[WARNING]{datetime.now().strftime("[%Y-%m-%d %H:%M:%S]")} The result does not converge.'
)

epBIC_value = compute_epBIC(omega.toarray(), S, self.gamma)
Expand All @@ -322,7 +322,7 @@ def fit(self, X, y=None, initial=None):
# Get final process memory
mem_after = process.memory_info().rss

print(f"[LOG] Execution Time: {end_time - start_time} seconds")
print(f"[LOG] Memory Usage: {mem_after - mem_before} bytes")
print(f"[LOG] Execution Time: {(end_time - start_time):.2f} seconds")
print(f"[LOG] Memory Usage: {(mem_after - mem_before):,} bytes")

return self
18 changes: 10 additions & 8 deletions gaccord/runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


def parse_index_range(index_str):
"""문자열로 입력된 인덱스 범위를 처리하는 함수. 예: '0,2,4-6'"""
"""Handle the range of index given by string. e.g. '0,2,4-6'"""
indices = []
for part in index_str.split(","):
if "-" in part:
Expand All @@ -24,23 +24,25 @@ def read_data(file_path, column_wise):
Reads an xlsx, xls, or csv file and returns header and data separately.

:param file_path: Path to the xlsx, xls, or csv file
:param column_wise: Whether the data is column-wise or row-wise
:return: (header, data) -> header is a list, data is a list of lists
"""
# 파일 확장자 확인
# Check the file format
if file_path.endswith(".xlsx"):
df = pd.read_excel(file_path, engine="openpyxl") # XLSX 처리
df = pd.read_excel(file_path, engine="openpyxl")
elif file_path.endswith(".xls"):
df = pd.read_excel(file_path, engine="xlrd") # XLS 처리
df = pd.read_excel(file_path, engine="xlrd")
elif file_path.endswith(".csv"):
df = pd.read_csv(file_path) # CSV 처리
df = pd.read_csv(file_path)
else:
raise ValueError("Unsupported file format. Please use .xlsx, .xls, or .csv")

# 헤더와 데이터 분리
# Get the name of variables and data depends on the orientation
if column_wise:
header = df.columns # 헤더 리스트
data = df.values # 데이터 리스트
header = df.columns
data = df.values
else:
#For row-wise data, the first column is name of the variables
header = df.iloc[:, 0]
data = df.iloc[:, 1:].T.values

Expand Down