Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Schenk_Brandenberger_S2_Aufg3.py

Schenk_Brandenberger_S2_Aufg3.py

@@ -7,8 +7,8 @@ def s2n(s1n):
 def s2n_new(s1n):
     return np.sqrt((s1n ** 2) / (2 * (1 + np.sqrt(1 - ((s1n ** 2) / 4)))))
 
-r = int(1) #Radius
-n = int(6) #Anzahl Ecken
+r = 1 #Radius
+n = 6 #Anzahl Ecken
 sn = r
 sn_new = r
 x = np.array([])
@@ -34,8 +34,8 @@ plt.plot(x, y)
 plt.plot(x, y_new)
 plt.xscale('log', base=2)
 plt.xlim((2**3, 2**31))
+plt.legend(["2*pi", "2*pi_new"])
 plt.ylim((6.25, 6.3))
-plt.legend(["pi", "pi_new"])
 plt.title("Aufgabe 3")
 plt.show()