metacountregressor 0.1.55__py3-none-any.whl → 0.1.57__py3-none-any.whl

metacountregressor/solution.py

@@ -5,18 +5,16 @@
 import ast
 import itertools
 import math
-#from bdb import GENERATOR_AND_COROUTINE_FLAGS
-#from dis import dis
+
 import os
-#from pyexpat.errors import XML_ERROR_INCOMPLETE_PE
+
 import random
 import sys
 import time
 import warnings
 from collections import Counter
 from functools import wraps
-#from tabnanny import verbose
-#from telnetlib import XAUTH
+
 from tempfile import TemporaryFile
 import traceback
 import latextable
@@ -24,12 +22,12 @@ import numpy as np
 import pandas as pd
 import psutil
 import scipy.special as sc
-#rom scipy.integrate import quad
+
 import statsmodels.api as sm
 from scipy.integrate import quad
 from scipy.optimize import minimize
 from scipy.stats import boxcox, gamma, lognorm, nbinom, norm, poisson, t
-#import sklearn
+
 from sklearn import preprocessing
 from scipy.special import gammaln
 from sklearn.metrics import mean_absolute_error as MAE
@@ -44,12 +42,9 @@ from texttable import Texttable
 #from optimparallel import minimize_parallel
 
 from ._device_cust import device as dev
-#from optimparallel import minimize_parallel
-#import pareto
 from .pareto_file import Pareto, Solution
 
-#import aesara
-#import aesara.tensor as T
+
 
 
 #np.seterr(divide='ignore', invalid='ignore')
@@ -3966,7 +3961,9 @@ class ObjectiveFunction(object):
                 #if b_gam < 0.8*model_nature['dispersion_penalty']:
                     #penalty +=  model_nature['dispersion_penalty'] -b_gam
             
-            
+            b_gam = np.exp(b_gam)
+            if b_gam > np.exp(6):
+                penalty += b_gam
             
             #if abs(b_gam) < 0.01:
              #   penalty += 1/np.abs(b_gam)
@@ -3974,9 +3971,9 @@ class ObjectiveFunction(object):
             
             
                  
-            if b_gam >= 4.5:
-                penalty += b_gam
-                b_gam = 4.61
+           # if b_gam >= 4.5:
+               # penalty += b_gam
+               # b_gam = 4.61
                 #b_gam = 7.9
                    # penalty +=  model_nature['dispersion_penalty'] -b_gam
                     #penalty += 1/np.max((0.01,abs(b_gam)))
@@ -5615,15 +5612,15 @@ class ObjectiveFunction(object):
     def _minimize(self, loglik_fn, x, args, method, tol, options, bounds = None, hess_calc = None):
         
         if method == "BFGS":
-            #return minimize(loglik_fn, x, args=args, jac=args[6], hess=True, method='BFGS', tol=tol, options=options)
+         
             
             
             try:
-                #return minimize(loglik_fn, x, args=args, jac=args[6], hess=args[7], method='BFGS', tol=tol, options=options)
+              
                 return self._bfgs(loglik_fn, x, args=args, tol=tol, **options) #@IgnoreException
                 
             except:
-                return minimize(loglik_fn, x, args=args, jac=args[6], hess=args[7], method='BFGS', tol=tol, options=options)
+                return minimize(loglik_fn, x, args=args, jac=args[6], method='BFGS', tol=tol, options=options)
                 
             
             
@@ -5653,7 +5650,7 @@ class ObjectiveFunction(object):
             else:
                 return result    
         elif method == 'BFGS_2':
-            return minimize(loglik_fn, x, args=args, jac=args[6], hess=args[7], method='BFGS')
+            return minimize(loglik_fn, x, args=args, jac=args[6], method='BFGS')
         elif method == "L-BFGS-B":
             
             return minimize(loglik_fn, x, args=args, jac=args[6],  hess = args[7], method='L-BFGS-B', bounds =bounds, tol=tol, options=options)

{metacountregressor-0.1.55.dist-info → metacountregressor-0.1.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: metacountregressor
-Version: 0.1.55
+Version: 0.1.57
 Summary: A python package for count regression of rare events assisted by metaheuristics
 Author: zahern
 Author-email: zeke.ahern@hdr.qut.edu.au

{metacountregressor-0.1.55.dist-info → metacountregressor-0.1.57.dist-info}/RECORD

@@ -39,7 +39,7 @@ metacountregressor/set_data.csv,sha256=68iJkW4O4HVM8GyNlO0drwp8ZMXkccXCUc7jnA8xn
 metacountregressor/set_data_s.csv,sha256=hELwnv6RjpmXcMheFafwrYbLbyYE21hFKyqJhA8L05o,11111
 metacountregressor/setup.py,sha256=CpbdBScFhvStc6WByFiAlP7T5wGdWetsLI8X5JRRpP4,268
 metacountregressor/single_objective_finder.py,sha256=QYXUpxJp7-ul5ZiIKGgYGaH_yFFGUbI7X3yKu5asogE,1960
-metacountregressor/solution.py,sha256=VCbyjNNnHjp_dx38bTuCbJTYJSaRtCAyMVB2jmwiBAA,313795
+metacountregressor/solution.py,sha256=X_emVvrny-Ku8mDsRdLw0fPIInj69jHmFnHLUQuHzqk,313311
 metacountregressor/Stage5A_1848_All_Initial_Columns.csv,sha256=uwsadEyupgIH1w5f8vnlwlo13ryww3VCGYlOnN0dEL0,188769
 metacountregressor/Stage5A_1848_All_Initial_Columns.xlsx,sha256=5U5Ab1jjGi5qoKp06Bw2tpdPjGaDGoyt5976AAFdEbs,699231
 metacountregressor/synth_dataset_generator.ipynb,sha256=caBMQJOaeINPZJw5aTsSOXhmenSqrpS7GycINAzUUxs,27153
@@ -49,6 +49,6 @@ metacountregressor/testML.R,sha256=UbTsLFUhoJG9bJnU2rbUKlfcprAkROnhREK41qKzbvQ,2
 metacountregressor/TestSetFake.csv,sha256=JPYAWYLAw7rgQHdGTz0rltMfapX8QYt3BVSyK_D-Lzg,1640
 metacountregressor/ThaiAccident.csv,sha256=NIi_uPyo5u-B6Hj0Ln9xuJ8fnvGbWK9GLdTWdpG5uug,418202
 metacountregressor/tk_app.py,sha256=0UM76hpQ-ha96ma_Z5ryxYQUSdF4PJBCsLuI1EGu6_E,59490
-metacountregressor-0.1.55.dist-info/METADATA,sha256=RP4Cf6-0HA6RET74YkiJD35lhjUURyG_g1VnXtg9uA8,13112
-metacountregressor-0.1.55.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-metacountregressor-0.1.55.dist-info/RECORD,,
+metacountregressor-0.1.57.dist-info/METADATA,sha256=5LQhxDBsE2PMp9DO_Xz0AU8dD3uXfOG3uTrDVHVcaSM,13112
+metacountregressor-0.1.57.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+metacountregressor-0.1.57.dist-info/RECORD,,