From 52868f1da19487b88c73ef5e6ad64cc804868ebd Mon Sep 17 00:00:00 2001
From: cpav <cpav@VINDRI-D17205.win.dtu.dk>
Date: Thu, 7 Apr 2016 14:29:25 +0200
Subject: [PATCH 1/3] new envelope in polar
---
wetb/prepost/Simulations.py | 90 +++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index a8abd120..f3f050f6 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -4912,6 +4912,96 @@ class Cases(object):
envelope[ch[0]] = closed_contour
return envelope
+ def compute_envelope2(self, sig, ch_list, thetanr = 361):
+
+ envelope= {}
+ theta_int = np.linspace(-np.pi,np.pi,thetanr)
+
+ for ch in ch_list:
+ chi0 = self.res.ch_dict[ch[0]]['chi']
+ chi1 = self.res.ch_dict[ch[1]]['chi']
+ s0 = np.array(sig[:, chi0]).reshape(-1, 1)
+ s1 = np.array(sig[:, chi1]).reshape(-1, 1)
+ cloud = np.append(s0, s1, axis=1)
+ hull = scipy.spatial.ConvexHull(cloud)
+ closed_contour = np.append(cloud[hull.vertices,:],
+ cloud[hull.vertices[0],:].reshape(1,2),
+ axis=0)
+ for ich in range(2, len(ch)):
+ chix = self.res.ch_dict[ch[ich]]['chi']
+ s0 = np.array(sig[hull.vertices, chix]).reshape(-1, 1)
+ s1 = np.array(sig[hull.vertices[0], chix]).reshape(-1, 1)
+ s0 = np.append(s0, s1, axis=0)
+ closed_contour = np.append(closed_contour, s0, axis=1)
+
+ upper = []
+ lower = []
+
+ indmax = np.argmax(closed_contour[:,0])
+ indmin = np.argmin(closed_contour[:,0])
+ if indmax > indmin:
+ lower = np.array(closed_contour[np.argmin(closed_contour[:,0]):\
+ np.argmax(closed_contour[:,0])+1,:])
+ upper = np.concatenate((closed_contour[np.argmax(closed_contour[:,0]):,:],\
+ closed_contour[:np.argmin(closed_contour[:,0])+1,:]),axis=0)
+ else:
+ upper = np.array(closed_contour[np.argmax(closed_contour[:,0]):\
+ np.argmin(closed_contour[:,0])+1,:])
+ lower = np.concatenate((closed_contour[np.argmin(closed_contour[:,0]):,:],\
+ closed_contour[:np.argmax(closed_contour[:,0])+1,:]),axis=0)
+
+ normx = max(max(upper[:,0]),abs(min(upper[:,0])),max(lower[:,0]),\
+ abs(min(lower[:,0])))
+ normy = max(max(upper[:,1]),abs(min(upper[:,1])),max(lower[:,1]),\
+ abs(min(lower[:,1])))
+
+ norm_up = np.array([upper[:,0]/normx,
+ upper[:,1]/normy]).T
+ norm_up = norm_up[np.argsort(norm_up,axis=0)[:,0]]
+
+ norm_low = np.array([lower[:,0]/normx,
+ lower[:,1]/normy]).T
+
+ int_x = np.linspace(-1,1,1e5)
+ int_y_up = np.interp(int_x,norm_up[:,0],norm_up[:,1])
+ int_y_low = np.interp(int_x,norm_low[:,0],norm_low[:,1])
+
+ int_x = int_x*normx
+ int_y_up = int_y_up*normy
+ int_y_low = int_y_low*normy
+
+ int_x = np.linspace(-1,1,1e5)
+ int_y_up = np.interp(int_x,norm_up[:,0],norm_up[:,1])
+ int_y_low = np.interp(int_x,norm_low[:,0],norm_low[:,1])
+
+ indremmax = np.where((int_x>max(closed_contour[:,0])))
+ indremmin = np.where((int_x<min(closed_contour[:,0])))
+ if len(indremmax[0]) > 2:
+ int_y_up = np.delete(int_y_up,indremmax[0][1:])
+ int_y_low = np.delete(int_y_low,indremmax[0][1:])
+ int_x = np.delete(int_x,indremmax[0][1:])
+ if len(indremmin[0]) > 2:
+ int_y_up = np.delete(int_y_up,indremmin[0][:-2])
+ int_y_low = np.delete(int_y_low,indremmin[0][:-2])
+ int_x = np.delete(int_x,indremmin[0][:-2])
+
+ R_up = np.sqrt(int_x**2+int_y_up**2)
+ theta_up = np.arctan2(int_y_up,int_x)
+
+ R_low = np.sqrt(int_x**2+int_y_low**2)
+ theta_low = np.arctan2(int_y_low,int_x)
+
+ R = np.concatenate((R_up,R_low))
+ theta = np.concatenate((theta_up,theta_low))
+ R = R[np.argsort(theta)]
+ theta = np.sort(theta)
+
+ R_int = np.interp(theta_int,theta,R,period=2*np.pi)
+
+ envelope[ch[0]] = np.array([theta_int,R_int]).T
+
+ return envelope
+
def envelope(self, silent=False, ch_list=[], append=''):
"""
Calculate envelopes and save them in a table.
--
GitLab
From 366e4a61aa66d0a936a7b154ff40aeefd9950aed Mon Sep 17 00:00:00 2001
From: cpav <cpav@VINDRI-D17205.win.dtu.dk>
Date: Fri, 8 Apr 2016 12:26:31 +0200
Subject: [PATCH 2/3] - Added function for cartesian interpolation of
envelopes; - Loads in output are array of consistently same length
---
wetb/prepost/Simulations.py | 132 ++++++++++++------------------------
1 file changed, 44 insertions(+), 88 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index f3f050f6..f0d28873 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -4890,7 +4890,7 @@ class Cases(object):
return result
- def compute_envelope(self, sig, ch_list):
+ def compute_envelope(self, sig, ch_list, int_env=False):
envelope= {}
for ch in ch_list:
@@ -4903,104 +4903,60 @@ class Cases(object):
closed_contour = np.append(cloud[hull.vertices,:],
cloud[hull.vertices[0],:].reshape(1,2),
axis=0)
+ if int_env:
+ closed_contour_int = self.int_envelope(closed_contour[:,0],\
+ closed_contour[:,1])
+
+
for ich in range(2, len(ch)):
chix = self.res.ch_dict[ch[ich]]['chi']
s0 = np.array(sig[hull.vertices, chix]).reshape(-1, 1)
s1 = np.array(sig[hull.vertices[0], chix]).reshape(-1, 1)
s0 = np.append(s0, s1, axis=0)
closed_contour = np.append(closed_contour, s0, axis=1)
- envelope[ch[0]] = closed_contour
+ if int_env:
+ extra_sensor = self.int_envelope(closed_contour[:,0],\
+ closed_contour[:,ich])
+ es = np.atleast_2d(np.array(extra_sensor[:,1])).T
+ closed_contour_int = np.append(closed_contour_int,es,axis=1)
+
+ if int_env:
+ envelope[ch[0]] = closed_contour_int
+ else:
+ envelope[ch[0]] = closed_contour
return envelope
-
- def compute_envelope2(self, sig, ch_list, thetanr = 361):
-
- envelope= {}
- theta_int = np.linspace(-np.pi,np.pi,thetanr)
- for ch in ch_list:
- chi0 = self.res.ch_dict[ch[0]]['chi']
- chi1 = self.res.ch_dict[ch[1]]['chi']
- s0 = np.array(sig[:, chi0]).reshape(-1, 1)
- s1 = np.array(sig[:, chi1]).reshape(-1, 1)
- cloud = np.append(s0, s1, axis=1)
- hull = scipy.spatial.ConvexHull(cloud)
- closed_contour = np.append(cloud[hull.vertices,:],
- cloud[hull.vertices[0],:].reshape(1,2),
- axis=0)
- for ich in range(2, len(ch)):
- chix = self.res.ch_dict[ch[ich]]['chi']
- s0 = np.array(sig[hull.vertices, chix]).reshape(-1, 1)
- s1 = np.array(sig[hull.vertices[0], chix]).reshape(-1, 1)
- s0 = np.append(s0, s1, axis=0)
- closed_contour = np.append(closed_contour, s0, axis=1)
-
- upper = []
- lower = []
+ def int_envelope(ch1,ch2,Nx=300):
+ # Function to interpolate envelopes and output arrays of same length
- indmax = np.argmax(closed_contour[:,0])
- indmin = np.argmin(closed_contour[:,0])
- if indmax > indmin:
- lower = np.array(closed_contour[np.argmin(closed_contour[:,0]):\
- np.argmax(closed_contour[:,0])+1,:])
- upper = np.concatenate((closed_contour[np.argmax(closed_contour[:,0]):,:],\
- closed_contour[:np.argmin(closed_contour[:,0])+1,:]),axis=0)
- else:
- upper = np.array(closed_contour[np.argmax(closed_contour[:,0]):\
- np.argmin(closed_contour[:,0])+1,:])
- lower = np.concatenate((closed_contour[np.argmin(closed_contour[:,0]):,:],\
- closed_contour[:np.argmax(closed_contour[:,0])+1,:]),axis=0)
-
- normx = max(max(upper[:,0]),abs(min(upper[:,0])),max(lower[:,0]),\
- abs(min(lower[:,0])))
- normy = max(max(upper[:,1]),abs(min(upper[:,1])),max(lower[:,1]),\
- abs(min(lower[:,1])))
-
- norm_up = np.array([upper[:,0]/normx,
- upper[:,1]/normy]).T
- norm_up = norm_up[np.argsort(norm_up,axis=0)[:,0]]
-
- norm_low = np.array([lower[:,0]/normx,
- lower[:,1]/normy]).T
+ # Number of points is defined by Nx + 1, where the + 1 is needed to
+ # close the curve
+
+ upper = []
+ lower = []
+
+ indmax = np.argmax(ch1)
+ indmin = np.argmin(ch1)
+ if indmax > indmin:
+ lower = np.array([ch1[indmin:indmax+1],ch2[indmin:indmax+1]]).T
+ upper = np.concatenate((np.array([ch1[indmax:],ch2[indmax:]]).T,\
+ np.array([ch1[:indmin+1],ch2[:indmin+1]]).T),axis=0)
+ else:
+ upper = np.array([ch1[indmax:indmin+1,:],ch2[indmax:indmin+1,:]]).T
+ lower = np.concatenate((np.array([ch1[indmin:],ch2[indmin:]]).T,\
+ np.array([ch1[:indmax+1],ch2[:indmax+1]]).T),axis=0)
- int_x = np.linspace(-1,1,1e5)
- int_y_up = np.interp(int_x,norm_up[:,0],norm_up[:,1])
- int_y_low = np.interp(int_x,norm_low[:,0],norm_low[:,1])
+
+ int_1 = np.linspace(min(min(upper[:,0]),min(lower[:,0])),\
+ max(max(upper[:,0]),max(upper[:,0])),Nx/2+1)
+ upper = np.flipud(upper)
+ int_2_up = np.interp(int_1,np.array(upper[:,0]),np.array(upper[:,1]))
+ int_2_low = np.interp(int_1,np.array(lower[:,0]),np.array(lower[:,1]))
- int_x = int_x*normx
- int_y_up = int_y_up*normy
- int_y_low = int_y_low*normy
-
- int_x = np.linspace(-1,1,1e5)
- int_y_up = np.interp(int_x,norm_up[:,0],norm_up[:,1])
- int_y_low = np.interp(int_x,norm_low[:,0],norm_low[:,1])
-
- indremmax = np.where((int_x>max(closed_contour[:,0])))
- indremmin = np.where((int_x<min(closed_contour[:,0])))
- if len(indremmax[0]) > 2:
- int_y_up = np.delete(int_y_up,indremmax[0][1:])
- int_y_low = np.delete(int_y_low,indremmax[0][1:])
- int_x = np.delete(int_x,indremmax[0][1:])
- if len(indremmin[0]) > 2:
- int_y_up = np.delete(int_y_up,indremmin[0][:-2])
- int_y_low = np.delete(int_y_low,indremmin[0][:-2])
- int_x = np.delete(int_x,indremmin[0][:-2])
-
- R_up = np.sqrt(int_x**2+int_y_up**2)
- theta_up = np.arctan2(int_y_up,int_x)
-
- R_low = np.sqrt(int_x**2+int_y_low**2)
- theta_low = np.arctan2(int_y_low,int_x)
-
- R = np.concatenate((R_up,R_low))
- theta = np.concatenate((theta_up,theta_low))
- R = R[np.argsort(theta)]
- theta = np.sort(theta)
-
- R_int = np.interp(theta_int,theta,R,period=2*np.pi)
-
- envelope[ch[0]] = np.array([theta_int,R_int]).T
-
- return envelope
+ int_env = np.concatenate((np.array([int_1[:-1],int_2_up[:-1]]).T,\
+ np.array([int_1[::-1],int_2_low[::-1]]).T),axis=0)
+
+ return int_env
def envelope(self, silent=False, ch_list=[], append=''):
"""
--
GitLab
From 390e1402e634e2a2dc23b5b02ce309a5e5b768a3 Mon Sep 17 00:00:00 2001
From: cpav <cpav@VINDRI-D17205.win.dtu.dk>
Date: Thu, 21 Apr 2016 09:33:22 +0200
Subject: [PATCH 3/3] Corrections to the function for cartesian interpolation
of envelopes: - number of interpolation points added to "compute_envelopes"
---
wetb/prepost/Simulations.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index f0d28873..732b03df 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -4890,7 +4890,7 @@ class Cases(object):
return result
- def compute_envelope(self, sig, ch_list, int_env=False):
+ def compute_envelope(self, sig, ch_list, int_env=False, Nx=300):
envelope= {}
for ch in ch_list:
@@ -4905,7 +4905,7 @@ class Cases(object):
axis=0)
if int_env:
closed_contour_int = self.int_envelope(closed_contour[:,0],\
- closed_contour[:,1])
+ closed_contour[:,1],Nx=Nx)
for ich in range(2, len(ch)):
@@ -4916,7 +4916,7 @@ class Cases(object):
closed_contour = np.append(closed_contour, s0, axis=1)
if int_env:
extra_sensor = self.int_envelope(closed_contour[:,0],\
- closed_contour[:,ich])
+ closed_contour[:,ich],Nx=Nx)
es = np.atleast_2d(np.array(extra_sensor[:,1])).T
closed_contour_int = np.append(closed_contour_int,es,axis=1)
@@ -4926,7 +4926,7 @@ class Cases(object):
envelope[ch[0]] = closed_contour
return envelope
- def int_envelope(ch1,ch2,Nx=300):
+ def int_envelope(ch1,ch2,Nx):
# Function to interpolate envelopes and output arrays of same length
# Number of points is defined by Nx + 1, where the + 1 is needed to
--
GitLab