diff --git a/.gitattributes b/.gitattributes index dfe0770..eba1110 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ # Auto detect text files and perform LF normalization -* text=auto +* text=auto \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f02998d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.avi \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9ee86e7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "[python]": { + "editor.defaultFormatter": "ms-python.autopep8" + }, + "python.formatting.provider": "none" +} \ No newline at end of file diff --git a/polaired.py b/polaired.py index ff5c58d..98dda8c 100644 --- a/polaired.py +++ b/polaired.py @@ -20,26 +20,6 @@ def rainbow_gradient(num_colors): return colors colors = rainbow_gradient(nbv) -def status(distances): - num_colors = len(distances) - colors = [] - base_color = Color("green") - target_color = Color("red") - luminance_start = base_color.get_luminance() - luminance_end = target_color.get_luminance() - for i in range(num_colors): - moydist = distances[i] - t = i / (num_colors - 1) - adjusted_luminance = luminance_start + (luminance_end - luminance_start) * (1 - t) * (moydist - 1) / 18 - color = Color(rgb=(base_color.rgb[0] * (1 - t) + target_color.rgb[0] * t, - base_color.rgb[1] * (1 - t) + target_color.rgb[1] * t, - base_color.rgb[2] * (1 - t) + target_color.rgb[2] * t)) - color.set_luminance(adjusted_luminance) - hex_code = color.hex_l - colors.append(hex_code) - return colors - - U = 1.25 # vitesse m.s-¹ Wm = 0.3 # distance minimale entre la voiture et celle qui la précède m Ws = 0.9 # m @@ -64,34 +44,24 @@ def position(fposition, newv): xxold = xxbase.copy() -while(t= Wm)* PHI # retourne la vitesse du véhicule + +y = np.linspace(1, 1, nbv) +xxbase = np.linspace(0, 1, nbv) + +def distances(fposition): + # print('fposition', fposition) + dist = np.diff(fposition) + inter = fposition[0]+20-fposition[-1] + newdist = np.insert(dist, len(dist), inter) + return newdist + +def position(fposition, newv): + newp = fposition + newv * dt + return newp + +xxold = xxbase.copy() + +# while(t