From f39a268b30edafc09e362e0545e6a52eafc0b2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <desired.mta@gmail.com>
Date: Sun, 24 Nov 2019 17:57:02 +0200
Subject: [PATCH] split measurement angles from pretty ones
---
Karto/assignment3/measure.py | 69 ++++++++++++++++++++++++------------
1 file changed, 47 insertions(+), 22 deletions(-)
diff --git a/Karto/assignment3/measure.py b/Karto/assignment3/measure.py
index f938598..f07cc4d 100755
--- a/Karto/assignment3/measure.py
+++ b/Karto/assignment3/measure.py
@@ -82,28 +82,53 @@ L2L7 = Dec('85.607') + H
L2L8 = Dec('114.589') + G
L2L9 = Dec('79.210') + D
-K1K1 = pr(Deg.guess('84-03-08.3').frac + P)
-K1K2 = rp(Deg.guess('112-58-25.4').frac + S)
-K1K3 = vp(Deg.guess('54.3107235').frac + L)
-K1K4 = pr(Deg.guess('84-33-44.2').frac + S)
-K1K5 = pv(Deg.guess('7.8383177').frac + P)
-K1K6 = vp(Deg.guess('23-15-32.7').frac + P)
-K1K7 = pv(Deg.guess('126.2540802').frac + K)
-K1K8 = pv(Deg.guess('205-29-57.8').frac + K)
-K1K9 = rs(Deg.guess('101.7366025').frac + S)
-K1K10 = sv(Deg.guess('160-23-45.2').frac + T)
-K1K11 = pv(Deg.guess('79.8680017').frac + K)
-K1K12 = vs(Deg.guess('52-28-42.4').frac + R)
-K1K13 = sr(Deg.guess('109-01-49.8').frac + T)
-K2K1 = vs(Deg.guess('84-00-34.4').frac + L)
-K2K2 = rs(Deg.guess('76.1245808').frac + N)
-K2K3 = pr(Deg.guess('54-13-28.3').frac + P)
-K2K4 = rp(Deg.guess('182.7394778').frac + S)
-K2K5 = sr(Deg.guess('162-45-25.7').frac + L)
-K2K6 = pr(Deg.guess('60-41-55.2').frac + S)
-K2K7 = rp(Deg.guess('69.4792556').frac + R)
-K2K8 = rp(Deg.guess('130-50-06.1').frac + L)
-K2K9 = vs(Deg.guess('84-08-54.3').frac + K)
+# Drawing angles
+DK1K1 = pr(Deg.guess('84-03-08.3').frac + P)
+DK1K2 = rp(Deg.guess('112-58-25.4').frac + S)
+DK1K3 = vp(Deg.guess('54.3107235').frac + L)
+DK1K4 = pr(Deg.guess('84-33-44.2').frac + S)
+DK1K5 = pv(Deg.guess('7.8383177').frac + P)
+DK1K6 = vp(Deg.guess('23-15-32.7').frac + P)
+DK1K7 = pv(Deg.guess('126.2540802').frac + K)
+DK1K8 = pv(Deg.guess('205-29-57.8').frac + K)
+DK1K9 = rs(Deg.guess('101.7366025').frac + S)
+DK1K10 = sv(Deg.guess('160-23-45.2').frac + T)
+DK1K11 = pv(Deg.guess('79.8680017').frac + K)
+DK1K12 = vs(Deg.guess('52-28-42.4').frac + R)
+DK1K13 = sr(Deg.guess('109-01-49.8').frac + T)
+DK2K1 = vs(Deg.guess('84-00-34.4').frac + L)
+DK2K2 = rs(Deg.guess('76.1245808').frac + N)
+DK2K3 = pr(Deg.guess('54-13-28.3').frac + P)
+DK2K4 = rp(Deg.guess('182.7394778').frac + S)
+DK2K5 = sr(Deg.guess('162-45-25.7').frac + L)
+DK2K6 = pr(Deg.guess('60-41-55.2').frac + S)
+DK2K7 = rp(Deg.guess('69.4792556').frac + R)
+DK2K8 = rp(Deg.guess('130-50-06.1').frac + L)
+DK2K9 = vs(Deg.guess('84-08-54.3').frac + K)
+
+# Answer angles
+K1K1 = Deg.guess('84-03-08.3').frac + P
+K1K2 = Deg.guess('112-58-25.4').frac + S
+K1K3 = Deg.guess('54.3107235').frac + L
+K1K4 = Deg.guess('84-33-44.2').frac + S
+K1K5 = Deg.guess('7.8383177').frac + P
+K1K6 = Deg.guess('23-15-32.7').frac + P
+K1K7 = Deg.guess('126.2540802').frac + K
+K1K8 = Deg.guess('205-29-57.8').frac + K
+K1K9 = Deg.guess('101.7366025').frac + S
+K1K10 = Deg.guess('160-23-45.2').frac + T
+K1K11 = Deg.guess('79.8680017').frac + K
+K1K12 = Deg.guess('52-28-42.4').frac + R
+K1K13 = Deg.guess('109-01-49.8').frac + T
+K2K1 = Deg.guess('84-00-34.4').frac + L
+K2K2 = Deg.guess('76.1245808').frac + N
+K2K3 = Deg.guess('54-13-28.3').frac + P
+K2K4 = Deg.guess('182.7394778').frac + S
+K2K5 = Deg.guess('162-45-25.7').frac + L
+K2K6 = Deg.guess('60-41-55.2').frac + S
+K2K7 = Deg.guess('69.4792556').frac + R
+K2K8 = Deg.guess('130-50-06.1').frac + L
+K2K9 = Deg.guess('84-08-54.3').frac + K
rek_kaina = Dec('871.29')
rek_plotas = Dec('97895.626')