faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Fixed solver and improved him.

Browse Source
This commit is contained in:
Faerbit 2015-02-27 23:34:25 +01:00
parent 272dce8900
commit 39882d43c3
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
flame_solver.py
View File

@ -2,11 +2,15 @@
from math import pi, sin, cos, exp from math import pi, sin, cos, exp
from numpy import arange from numpy import arange
from collections import namedtuple
Result = namedtuple("Result", ["p1", "p2", "error"])
def main():
# f(x) = p1 * sin(p2 * x) # f(x) = p1 * sin(p2 * x)
parameter_sin_1=3 parameter_sin_1=2
parameter_sin_2=0.3 parameter_sin_2=0.5
transition_point = (1/parameter_sin_2) * pi * 0.75 transition_point = (1/parameter_sin_2) * pi * 0.75
@ -15,27 +19,36 @@ sin_value = parameter_sin_1 * sin(parameter_sin_2 * transition_point)
derived_sin_value = parameter_sin_1 * parameter_sin_2 * cos(parameter_sin_2 * transition_point) derived_sin_value = parameter_sin_1 * parameter_sin_2 * cos(parameter_sin_2 * transition_point)
#g(x) = e^(p1 - p2 * x) #g(x) = e^(p1 - p2 * x)
parameter_ex_p1 = list(arange(0,10, 0.01)) result = Result(10, 10, 1)
parameter_ex_p2 = list(arange(0, 1, 0.00001)) step = 10
while (result.error > 0.0001):
parameter_ex_p1 = list(arange(result.p1 - step, result.p1 + step, step/10))
parameter_ex_p2 = list(arange(result.p2 - step, result.p2 + step, step/100))
step /= 10
result = calculate(parameter_ex_p1, parameter_ex_p2, transition_point, sin_value, derived_sin_value)
print("transition point: " + str(transition_point))
print("p1: " + str(result.p1))
print("p2: " + str(result.p2))
print("combined error: " + str(result.error))
def calculate(parameter_ex_p1, parameter_ex_p2, transition_point, sin_value, derived_sin_value):
best_parameter_ex_p1 = -1 best_parameter_ex_p1 = -1
best_parameter_ex_p2 = -1 best_parameter_ex_p2 = -1
value = exp(parameter_ex_p1[0] - parameter_ex_p2[0] * transition_point) best_combined_error = 100
derived_value = - parameter_ex_p2[0] * exp(parameter_ex_p1[0] - parameter_ex_p2[0] * transition_point)
value_error = abs(value - sin_value)
derived_value_error = abs(derived_value - derived_sin_value)
for p1 in parameter_ex_p1: for p1 in parameter_ex_p1:
for p2 in parameter_ex_p2: for p2 in parameter_ex_p2:
value = exp(p1 - p2 * transition_point) value = exp(p1 - p2 * transition_point)
derived_value = - p2 * exp(p1 - p2 * transition_point) derived_value = - p2 * exp(p1 - p2 * transition_point)
if abs(value - sin_value) < value_error and abs(derived_value - derived_sin_value) < derived_value_error: error = abs(value - sin_value)
value_error = abs(value -sin_value) derived_error = abs(derived_value - derived_sin_value)
derived_value_error = abs(derived_value - derived_sin_value) combined_error = error + derived_error
if combined_error < best_combined_error:
best_parameter_ex_p1 = p1 best_parameter_ex_p1 = p1
best_parameter_ex_p2 = p2 best_parameter_ex_p2 = p2
best_combined_error = combined_error
return Result(best_parameter_ex_p1, best_parameter_ex_p2, best_combined_error)
print("p1: " + str(best_parameter_ex_p1)) if __name__ == "__main__":
print("p2: " + str(best_parameter_ex_p2)) main()
print("value error: " + str(value_error))
print("derived value error: " + str(derived_value_error))