FGFS-4.1/fgtools
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added script for VSPAERO .history file -> JSBSim FDM table conversion, added sinusoidal method to utils.interpolator

Browse Source
This commit is contained in:
TheFGFSEagle
2022-06-27 22:12:55 +02:00
parent 549a466223
commit 93724b4a3a
7 changed files with 156 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
utils/__init__.py Normal file → Executable file
View File

57
utils/interpolator.py
View File

@@ -1,13 +1,13 @@
#!/usr/bin/env python
#-*- coding:utf-8 -*-
import math
class Interpolator:
def __init__(self):
self._indexes = []
self._values = []
self._sorted = False
self.methods = {"linear": self._interpolate_linear}
def add_value(self, index, value):
if type(index) not in (int, float) or type(value) not in (int, float):
@@ -26,7 +26,7 @@ class Interpolator:
self.add_value(i, v)
def interpolate(self, index, extrapolate=True, method="linear", sort=True):
if not method in self.methods:
if not hasattr(self, "_interpolate_" + method):
raise NotImplementedError(f"Interpolator.interpolate: interpolation method '{method}' not yet supported")
if len(self._indexes) < 2:
@@ -38,7 +38,22 @@ class Interpolator:
self._values.sort()
self._sorted = True
return self.methods[method](index, extrapolate)
if index in self._indexes:
return self._values[self._indexes.index(index)]
if self._indexes[0] < index < self._indexes[-1]:
return getattr(self, "_interpolate_" + method)(index, extrapolate)
else:
if not extrapolate:
if index < self._indexes[0]:
return self._values[0]
else:
return self._values[-1]
else:
if index < self._indexes[0]:
return self._values[1] + (index - self._indexes[1]) / (self._indexes[0] - self._indexes[1]) * (self._values[0] - self._values[1])
else:
return self._values[-2] + (index - self._indexes[-2]) / (self._indexes[-1] - self._indexes[-2]) * (self._values[-1] - self._values[-2])
def _find_neighbours(self, index):
lower = upper = 0
@@ -53,30 +68,24 @@ class Interpolator:
return lower, upper
def _interpolate_linear(self, index, extrapolate=True):
if index in self._indexes:
return self._values[self._indexes.index(index)]
if self._indexes[0] < index < self._indexes[-1]:
lower, upper = self._find_neighbours(index)
return self._values[lower] + (self._values[upper] - self._values[lower]) * (index - self._indexes[lower]) / (self._indexes[upper] - self._indexes[lower])
else:
if not extrapolate:
if index < self._indexes[0]:
return self._values[0]
else:
return self._values[-1]
else:
if index < self._indexes[0]:
return self._values[1] + (index - self._indexes[1]) / (self._indexes[0] - self._indexes[1]) * (self._values[0] - self._values[1])
else:
return self._values[-2] + (index - self._indexes[-2]) / (self._indexes[-1] - self._indexes[-2]) * (self._values[-1] - self._values[-2])
lower, upper = self._find_neighbours(index)
return self._values[lower] + (self._values[upper] - self._values[lower]) * (index - self._indexes[lower]) / (self._indexes[upper] - self._indexes[lower])
def _interpolate_sinusoidal(self, index, extrapolate=True):
lower, upper = self._find_neighbours(index)
return self._values[lower] + (self._values[upper] - self._values[lower]) * math.sin(math.radians((index - self._indexes[lower]) / (self._indexes[upper] - self._indexes[lower]) * 90))
# run test if run directly
if __name__ == "__main__":
print("Test results")
print("Test results:")
print()
i = Interpolator()
i.add_values((0, 10, 20), (0, 20, 30))
for test_val in (-5, 0, 1, 2, 3.5, 5.55555, 9, 10, 15, 100):
print(test_val, i.interpolate(test_val))
test_vals = (-5, 0, 1, 2, 3.5, 5.55555, 10, 15, 35, 100)
for method in ("linear", "sinusoidal"):
print(method.capitalize() + ":")
for test_val in test_vals:
print(test_val, "=>", i.interpolate(test_val, method=method))
print()