Back to np.log

Author: Gossty

qiita_db/support_files/patches/test_db_sql/94.sql

@@ -1,10 +1,10 @@
 INSERT INTO qiita.allocation_equations(equation_name, expression)
         VALUES 
-        ('mem_model1', '(k * (log(x))) + (x * a) + b'),
-('mem_model2', '(k * (log(x))) + (b * ((log(x))**2)) + a'),
-('mem_model3', '(k * (log(x))) + (b * ((log(x))**2)) + (a * ((log(x))**3))'),
-('mem_model4', '(k * (log(x))) + (b * ((log(x))**2)) + (a * ((log(x))**2.5))'),
-('time_model1', 'a + b + ((log(x)) * k)'),
-('time_model2', 'a + (b * x) + ((log(x)) * k)'),
-('time_model3', 'a + (b * ((log(x))**2)) + ((log(x)) * k)'),
-('time_model4', '(a * ((log(x))**3)) + (b * ((log(x))**2)) + ((log(x)) * k)');
+        ('mem_model1', '(k * (np.log(x))) + (x * a) + b'),
+('mem_model2', '(k * (np.log(x))) + (b * ((np.log(x))**2)) + a'),
+('mem_model3', '(k * (np.log(x))) + (b * ((np.log(x))**2)) + (a * ((np.np.log(x))**3))'),
+('mem_model4', '(k * (np.log(x))) + (b * ((np.log(x))**2)) + (a * ((np.log(x))**2.5))'),
+('time_model1', 'a + b + ((np.log(x)) * k)'),
+('time_model2', 'a + (b * x) + ((np.log(x)) * k)'),
+('time_model3', 'a + (b * ((np.log(x))**2)) + ((np.log(x)) * k)'),
+('time_model4', '(a * ((np.log(x))**3)) + (b * ((np.log(x))**2)) + ((np.log(x)) * k)');

qiita_db/test/test_meta_util.py

@@ -529,20 +529,18 @@ def test_update_resource_allocation_redis(self):
             cname, sname, version, col_name, 'title_mem')
         title_mem = str(r_client.get(title_mem_str))
         self.assertTrue(
-            "model: "
-            "k * log(x) + "
-            "b * log(x)^2 + "
-            "a * log(x)^2.5" in title_mem
+            "model: (k * (np.log(x))) + "
+            "(b * ((np.log(x))**2)) + "
+            "(a * ((np.log(x))**2.5))" in title_mem
         )
 
         title_time_str = 'resources$#%s$#%s$#%s$#%s:%s' % (
                         cname, sname, version, col_name, 'title_time')
         title_time = str(r_client.get(title_time_str))
         self.assertTrue(
-            "model: "
-            "a * log(x)^3 + "
-            "b * log(x)^2 + "
-            "log(x) * k" in title_time
+            "model: (a * ((np.log(x))**3)) + "
+            "(b * ((np.log(x))**2)) + "
+            "((np.log(x)) * k)" in title_time
         )
 
 

qiita_db/util.py

@@ -76,7 +76,6 @@
 import matplotlib.pyplot as plt
 from matplotlib import colormaps
 import numpy as np
-from numpy import log
 import pandas as pd
 from io import StringIO
 from json import loads
@@ -2383,31 +2382,14 @@ def retrieve_equations():
         qdb.sql_connection.TRN.add(sql)
         res = qdb.sql_connection.TRN.execute_fetchindex()
     for models in res:
-        model_name = "Unknown model"
-        if models[1] == 'mem_model1':
-            model_name = "k * log(x) + x * a + b"
-        elif models[1] == 'mem_model2':
-            model_name = "k * log(x) + b * log(x)^2 + a"
-        elif models[1] == 'mem_model3':
-            model_name = "k * log(x) + b * log(x)^2 + a * log(x)^3"
-        elif models[1] == 'mem_model4':
-            model_name = "k * log(x) + b * log(x)^2 + a * log(x)^2.5"
-        elif models[1] == 'time_model1':
-            model_name = "a + b + log(x) * k"
-        elif models[1] == 'time_model2':
-            model_name = "a + b * x + log(x) * k"
-        elif models[1] == 'time_model3':
-            model_name = "a + b * log(x)^2 + log(x) * k"
-        elif models[1] == 'time_model4':
-            model_name = "a * log(x)^3 + b * log(x)^2 + log(x) * k"
         if 'mem' in models[1]:
             memory_models[models[1]] = {
-                "equation_name": model_name,
+                "equation_name": models[2],
                 "equation": lambda x, k, a, b: eval(models[2])
             }
         else:
             time_models[models[1]] = {
-                "equation_name": model_name,
+                "equation_name": models[2],
                 "equation": lambda x, k, a, b: eval(models[2])
             }
     return (memory_models, time_models)