MilesCranmer commited on
Commit
45bf2c2
1 Parent(s): 8775039

Assume normal csv format in reads

Browse files
Files changed (2) hide show
  1. pysr/sr.py +4 -4
  2. pysr/version.py +1 -1
pysr/sr.py CHANGED
@@ -1969,12 +1969,12 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
1969
  cur_filename = str(self.equation_file_) + f".out{i}" + ".bkup"
1970
  if not os.path.exists(cur_filename):
1971
  cur_filename = str(self.equation_file_) + f".out{i}"
1972
- df = pd.read_csv(cur_filename, sep="|")
1973
  # Rename Complexity column to complexity:
1974
  df.rename(
1975
  columns={
1976
  "Complexity": "complexity",
1977
- "MSE": "loss",
1978
  "Equation": "equation",
1979
  },
1980
  inplace=True,
@@ -1985,11 +1985,11 @@ class PySRRegressor(MultiOutputMixin, RegressorMixin, BaseEstimator):
1985
  filename = str(self.equation_file_) + ".bkup"
1986
  if not os.path.exists(filename):
1987
  filename = str(self.equation_file_)
1988
- all_outputs = [pd.read_csv(filename, sep="|")]
1989
  all_outputs[-1].rename(
1990
  columns={
1991
  "Complexity": "complexity",
1992
- "MSE": "loss",
1993
  "Equation": "equation",
1994
  },
1995
  inplace=True,
 
1969
  cur_filename = str(self.equation_file_) + f".out{i}" + ".bkup"
1970
  if not os.path.exists(cur_filename):
1971
  cur_filename = str(self.equation_file_) + f".out{i}"
1972
+ df = pd.read_csv(cur_filename)
1973
  # Rename Complexity column to complexity:
1974
  df.rename(
1975
  columns={
1976
  "Complexity": "complexity",
1977
+ "Loss": "loss",
1978
  "Equation": "equation",
1979
  },
1980
  inplace=True,
 
1985
  filename = str(self.equation_file_) + ".bkup"
1986
  if not os.path.exists(filename):
1987
  filename = str(self.equation_file_)
1988
+ all_outputs = [pd.read_csv(filename)]
1989
  all_outputs[-1].rename(
1990
  columns={
1991
  "Complexity": "complexity",
1992
+ "Loss": "loss",
1993
  "Equation": "equation",
1994
  },
1995
  inplace=True,
pysr/version.py CHANGED
@@ -1,2 +1,2 @@
1
  __version__ = "0.9.5"
2
- __symbolic_regression_jl_version__ = "0.9.7"
 
1
  __version__ = "0.9.5"
2
+ __symbolic_regression_jl_version__ = "0.10.0"