From 4d9a68c30b7b2ab7aac2a224bb0b65d77986f982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 18 Nov 2019 12:25:34 +0200 Subject: [PATCH] measure.txt is redundant --- Karto/assignment3/measure.py | 20 +++++++------- Karto/assignment3/measure.txt | 49 ----------------------------------- 2 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 Karto/assignment3/measure.txt diff --git a/Karto/assignment3/measure.py b/Karto/assignment3/measure.py index 2150dc8..b82aec6 100755 --- a/Karto/assignment3/measure.py +++ b/Karto/assignment3/measure.py @@ -22,18 +22,18 @@ P = Decimal('-3.1145084') R = Decimal('-7.2564859') S = Decimal('3.8874407') T = Decimal('-8.7554531') - -# Sklypu pradiniu tasku (1 ir 15) koordinates: -X1 = Decimal('16639.290') -Y1 = Decimal('25500.960') -X15 = Decimal('17191.590') -Y15 = Decimal('25121.430') -# Sklypu sujungimo tasko T3 koordinates: -XT3 = Decimal('16971.790') -YT3 = Decimal('26685.160') +print("""Sklypu pradiniu tasku (1 ir 15) koordinates: +X1 = 16639.290 +Y1 = 25500.960 +X15 = 17191.590 +Y15 = 25121.430 -print("""Atkarpos: +Sklypu sujungimo tasko T3 koordinates: +XT3 = 16971.790 +YT3 = 26685.160 + +Atkarpos: 1L-1 = %.3f""" % (Decimal('125.829') + G) + """ 1L-2 = %.3f""" % (Decimal('81.682') + E) + """ 1L-3 = %.3f""" % (Decimal('61.206') + H) + """ diff --git a/Karto/assignment3/measure.txt b/Karto/assignment3/measure.txt deleted file mode 100644 index 66d3bb5..0000000 --- a/Karto/assignment3/measure.txt +++ /dev/null @@ -1,49 +0,0 @@ -Atkarpos: -1L-1 = 124.363 -1L-2 = 75.775 -1L-3 = 68.047 -1L-4 = 123.917 -1L-5 = 81.891 -1L-6 = 166.140 -1L-7 = 70.593 -1L-8 = 49.625 -1L-9 = 90.021 -1L-10 = 61.788 -1L-11 = 74.237 -1L-12 = 124.071 -1L-13 = 98.909 - -2L-1 = 210.059 -2L-2 = 121.354 -2L-3 = 185.498 -2L-4 = 118.986 -2L-5 = 91.634 -2L-6 = 134.547 -2L-7 = 92.448 -2L-8 = 113.123 -2L-9 = 82.072 - -Kampai: -1K-1(L-M-S) = 80.9377972 -1K-2(L-M-S) = 116.8611629 -1K-3(L) = 47.6678960 -1K-4(L-M-S) = 88.4497185 -1K-5(L) = 4.7238093 -1K-6(L-M-S) = 20.1445749 -1K-7(L) = 118.5118016 -1K-8(L-M-S) = 197.7571103 -1K-9(L) = 105.6240432 -1K-10(L-M-S) = 151.6404358 -1K-11(L) = 72.1257231 -1K-12(L-M-S) = 45.2219585 -1K-13(L-M-S) = 100.2750469 - -2K-1(L-M-S) = 77.3667281 -2K-2(L) = 71.8373765 -2K-3(L-M-S) = 51.1100194 -2K-4(L) = 186.6269185 -2K-5(L-M-S) = 156.1143114 -2K-6(L-M-S) = 64.5861074 -2K-7(L) = 62.2227697 -2K-8(L-M-S) = 124.1922003 -2K-9(L-M-S) = 76.4061381