diff --git a/TICC_solver.py b/TICC_solver.py index 655db8b..8758b05 100644 --- a/TICC_solver.py +++ b/TICC_solver.py @@ -45,17 +45,18 @@ def __init__(self, window_size=10, number_of_clusters=5, lambda_parameter=11e-2, np.set_printoptions(formatter={'float': lambda x: "{0:0.4f}".format(x)}) np.random.seed(102) - def fit(self, input_file): + def fit(self, input_file, delimiter=","): """ Main method for TICC solver. Parameters: - input_file: location of the data file + - delimiter: delimiter of the data in the input file """ assert self.maxIters > 0 # must have at least one iteration self.log_parameters() # Get data into proper format - times_series_arr, time_series_rows_size, time_series_col_size = self.load_data(input_file) + times_series_arr, time_series_rows_size, time_series_col_size = self.load_data(input_file, delimiter) ############ # The basic folder to be created @@ -358,8 +359,8 @@ def prepare_out_directory(self): return str_NULL - def load_data(self, input_file): - Data = np.loadtxt(input_file, delimiter=",") + def load_data(self, input_file, delimiter): + Data = np.loadtxt(input_file, delimiter=delimiter) (m, n) = Data.shape # m: num of observations, n: size of observation vector print("completed getting the data") return Data, m, n