From 65585939aef85c7fd95ba1101df714bb0f95289e Mon Sep 17 00:00:00 2001
From: Alexandr Velikiy <39257464+VargBurz@users.noreply.github.com>
Date: Tue, 4 Sep 2018 14:23:35 +0300
Subject: [PATCH] minor drop and jump models improvements (#131)

---
 analytics/models/drop_model.py |  9 +++------
 analytics/models/jump_model.py | 12 ++++++------
 analytics/utils/__init__.py    |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/analytics/models/drop_model.py b/analytics/models/drop_model.py
index 065d6a3..ca97d3a 100644
--- a/analytics/models/drop_model.py
+++ b/analytics/models/drop_model.py
@@ -10,7 +10,7 @@ import numpy as np
 import pandas as pd
 from typing import Optional
 
-WINDOW_SIZE = 400
+WINDOW_SIZE = 300
 
 class DropModel(Model):
     def __init__(self):
@@ -115,8 +115,8 @@ class DropModel(Model):
         for i in range(1, len(segments)):
             if segments[i] < segments[i - 1] + variance_error:
                 delete_list.append(segments[i])
-        for item in delete_list:
-            segments.remove(item)
+        #for item in delete_list:
+        #    segments.remove(item)
         delete_list = []
 
         if len(segments) == 0 or len(self.idrops) == 0 :
@@ -134,7 +134,4 @@ class DropModel(Model):
         for item in delete_list:
             segments.remove(item)
 
-        for idrop in self.idrops:
-            segments.append(idrop)
-
         return segments
diff --git a/analytics/models/jump_model.py b/analytics/models/jump_model.py
index e17d302..badf453 100644
--- a/analytics/models/jump_model.py
+++ b/analytics/models/jump_model.py
@@ -12,7 +12,7 @@ from scipy.stats import norm
 from typing import Optional
 
 
-WINDOW_SIZE = 400
+WINDOW_SIZE = 300
 
 class JumpModel(Model):
 
@@ -64,7 +64,7 @@ class JumpModel(Model):
                 segment_median = ax_list[antipeaks_kde[0], 0]
                 segment_min_line = ax_list[min_peak_index, 0]
                 segment_max_line = ax_list[max_peak_index, 0]
-                jump_height = 0.9 * (segment_max_line - segment_min_line)
+                jump_height = 0.95 * (segment_max_line - segment_min_line)
                 jump_height_list.append(jump_height)
                 jump_length = utils.find_jump_length(segment_data, segment_min_line, segment_max_line)
                 jump_length_list.append(jump_length)
@@ -118,8 +118,8 @@ class JumpModel(Model):
         for i in range(1, len(segments)):
             if segments[i] < segments[i - 1] + variance_error:
                 delete_list.append(segments[i])
-        for item in delete_list:
-            segments.remove(item)
+        #for item in delete_list:
+            #segments.remove(item)
         delete_list = []
         if len(segments) == 0 or len(self.ijumps) == 0 :
             segments = []
@@ -138,7 +138,7 @@ class JumpModel(Model):
         for item in delete_list:
             segments.remove(item)
 
-        for ijump in self.ijumps:
-            segments.append(ijump)
+        #for ijump in self.ijumps:
+            #segments.append(ijump)
 
         return segments
diff --git a/analytics/utils/__init__.py b/analytics/utils/__init__.py
index 513c20a..e24b87f 100644
--- a/analytics/utils/__init__.py
+++ b/analytics/utils/__init__.py
@@ -198,7 +198,7 @@ def find_drop(data, height, length):
     for i in range(len(data)-length-1):
         for x in range(1, length):
             if(data[i+x] < data[i] - height):
-                d_list.append(i+36)
+                d_list.append(i)
     return(d_list)
 
 def timestamp_to_index(dataframe, timestamp):