fix submodule imports & examples

Author: Ohjeah

example/ex_efs.py renamed to example/efs.py

@@ -1,8 +1,6 @@
-from sklearn.model_selection import train_test_split
 import numpy as np
 
-from sparsereg.model.ffx import run_ffx, FFX
-
+from sparsereg.model.ffx import FFX
 
 np.random.seed(42)
 x = np.random.normal(size=(1000, 2))
@@ -11,4 +9,3 @@
 model = FFX(n_jobs=-1)
 model.fit(x, y)
 print(model.print_model())
-print(model.predict(x).shape)

example/ex_ffx.py renamed to example/ffx.py

@@ -2,10 +2,11 @@
 from sklearn.linear_model import Lasso
 import matplotlib.pyplot as plt
 import numpy as np
-import symfeat as sf
-from sparsereg.sindy import SINDy
+import sparsereg.preprocessing.symfeat as sf
+
+from sparsereg.model import STRidge
+from sparsereg.util.net import net
 
-from sparsereg.net import net
 data = load_boston()
 x, y = data.data, data.target
 
@@ -16,9 +17,9 @@
 sym = sf.SymbolicFeatures(exponents=exponents, operators=operators)
 features = sym.fit_transform(x)
 
-ests = [Lasso, SINDy]
-attrs = ["alpha", "knob"]
-names = ["Lasso", "SINDy"]
+ests = [Lasso, STRidge]
+attrs = ["alpha", "threshold"]
+names = ["Lasso", "STRidge"]
 
 
 for est, attr, name in zip(ests, attrs, names):
@@ -33,4 +34,4 @@
 plt.xlabel("# coefficient")
 plt.ylabel(r"$R^2$")
 plt.gca().invert_xaxis()
-plt.show()
+plt.show()

example/net.py

@@ -1,3 +1,3 @@
-from .model import *
-from .preprocessing import *
-from .util import *
+from sparsereg.model import *
+from sparsereg.preprocessing import *
+from sparsereg.util import *

sparsereg/__init__.py

@@ -1 +1 @@
-__version__ = '0.6.1'
+__version__ = '0.6.2'