sciml 0.0.4__tar.gz → 0.0.6__tar.gz

{sciml-0.0.4 → sciml-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciml
-Version: 0.0.4
+Version: 0.0.6
 Summary: draw and basic calculations/conversions
 Home-page: https://github.com/soonyenju/sciml
 Author: Songyan Zhu
@@ -11,4 +11,3 @@ Platform: any
 License-File: LICENSE
 
 coming soon
-

{sciml-0.0.4 → sciml-0.0.6}/sciml/pipelines.py

@@ -1,8 +1,12 @@
 import numpy as np
+import pandas as pd
 from scipy import stats
 from sklearn.metrics import mean_squared_error
 
 def get_metrics(df, truth = 'truth', pred = 'pred', return_dict = False):
+    '''
+    Calculate statistical measures between validation and prediction sequences
+    '''
     df = df[[truth, pred]].copy().dropna()
     slope, intercept, r_value, p_value, std_err = stats.linregress(df.dropna()[truth], df.dropna()[pred])
     r2 = r_value**2
@@ -11,7 +15,7 @@ def get_metrics(df, truth = 'truth', pred = 'pred', return_dict = False):
     mbe = np.mean(df.dropna()[pred] - df.dropna()[truth])
     mae = (df.dropna()[pred] - df.dropna()[truth]).abs().mean()
     if return_dict:
-        return {
+        return pd.DataFrame.from_dict([{
             'R2': r2, 
             'Slope': slope, 
             'RMSE': rmse, 
@@ -20,7 +24,7 @@ def get_metrics(df, truth = 'truth', pred = 'pred', return_dict = False):
             'Intercept': intercept, 
             'p-value': p_value, 
             'std_err': std_err
-        }
+        }])
     else:
         return r2, slope, rmse, mbe, mae, intercept, p_value, std_err
 
@@ -108,19 +112,22 @@ def train_ml(
 
 def test_ml(X_test, y_test, regr):
     res = y_test.copy() # y_test is 2D pandas dataframe.
-    res.columns = ['true']
+    res.columns = ['truth']
     res['pred'] = regr.predict(X_test)
     return res
 
 # ===============================================================================================================================
 # Deep learning neural networks
 
-from tensorflow import keras
-from tensorflow.keras import layers
-from tensorflow.keras import models
-# from keras.layers import Dropout
-from keras.callbacks import EarlyStopping
-from scitbx.stutils import *
+try:
+    from tensorflow import keras
+    from tensorflow.keras import layers
+    from tensorflow.keras import models
+    # from keras.layers import Dropout
+    from keras.callbacks import EarlyStopping
+    from scitbx.stutils import *
+except Exception as e:
+    print(e)
 
 def train_lstm(X_train, y_train, nfeature, ntime, verbose = 2, epochs = 200, batch_size = 64):
     # create and fit the LSTM network

{sciml-0.0.4 → sciml-0.0.6}/sciml.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciml
-Version: 0.0.4
+Version: 0.0.6
 Summary: draw and basic calculations/conversions
 Home-page: https://github.com/soonyenju/sciml
 Author: Songyan Zhu
@@ -11,4 +11,3 @@ Platform: any
 License-File: LICENSE
 
 coming soon
-

{sciml-0.0.4 → sciml-0.0.6}/setup.py

@@ -13,7 +13,7 @@ from setuptools import setup, find_packages
 
 setup(
 	name = "sciml",
-	version = "0.0.4",
+	version = "0.0.6",
 	keywords = ("Scientific machine learning wrappers"),
 	description = "draw and basic calculations/conversions",
 	long_description = "coming soon",