From ee5cee7325dbfba6f6c685bcd7549c1c1b414e6b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:06:15 +0300 Subject: [PATCH 01/35] Create triangle-medians-point.txt --- test/input/triangle-medians-point.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-medians-point.txt diff --git a/test/input/triangle-medians-point.txt b/test/input/triangle-medians-point.txt new file mode 100644 index 0000000..ea865fd --- /dev/null +++ b/test/input/triangle-medians-point.txt @@ -0,0 +1 @@ +M и N -- соответственно середины сторон BC и AC треугольника ABC; точка F отмечена так, что FM _| BC, FN _| AC. Найдите расстояние от точки F до прямой AB, если AB = 16, CF = 10. From 4a71081ef8554680d4c6fb894cf58123afbed542 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:09:37 +0300 Subject: [PATCH 02/35] Create triangle-bisectors-cross.txt --- test/input/triangle-bisectors-cross.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-bisectors-cross.txt diff --git a/test/input/triangle-bisectors-cross.txt b/test/input/triangle-bisectors-cross.txt new file mode 100644 index 0000000..efaa4de --- /dev/null +++ b/test/input/triangle-bisectors-cross.txt @@ -0,0 +1 @@ +AM и CM -- биссектрисы треугольника ABC. Найдите расстояние от точки M до прямой AC, если BM = m, Date: Mon, 18 Sep 2017 10:12:12 +0300 Subject: [PATCH 03/35] Create triangle-medians-perpendicular-indexed.txt --- test/input/triangle-medians-perpendicular-indexed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-medians-perpendicular-indexed.txt diff --git a/test/input/triangle-medians-perpendicular-indexed.txt b/test/input/triangle-medians-perpendicular-indexed.txt new file mode 100644 index 0000000..146760e --- /dev/null +++ b/test/input/triangle-medians-perpendicular-indexed.txt @@ -0,0 +1 @@ +В треугольнике ABC медианы AA1 и BB1 взаимно перпендикулярны. Найдите отношение медианы CC1 к стороне AB. From 6633b24cb9aa8f4cd0fff6802aa84a933767dc7b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:14:56 +0300 Subject: [PATCH 04/35] Create triangle-quadrangle-medians-cross-square --- test/input/triangle-quadrangle-medians-cross-square | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-quadrangle-medians-cross-square diff --git a/test/input/triangle-quadrangle-medians-cross-square b/test/input/triangle-quadrangle-medians-cross-square new file mode 100644 index 0000000..a818bee --- /dev/null +++ b/test/input/triangle-quadrangle-medians-cross-square @@ -0,0 +1 @@ +O -- точка пересечения медиан BD и CE треугольника ABC. Найдите площадь четырёхугольника AEOD, если площадь трегольника ABS равна S. From d4e5773ed5361508648cbbea40cb501446e80d2a Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:18:51 +0300 Subject: [PATCH 05/35] Create circle-chords-angle.txt --- test/input/circle-chords-angle.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/circle-chords-angle.txt diff --git a/test/input/circle-chords-angle.txt b/test/input/circle-chords-angle.txt new file mode 100644 index 0000000..8165a51 --- /dev/null +++ b/test/input/circle-chords-angle.txt @@ -0,0 +1 @@ +AB -- диаметр окружности; точка C лежит вне окружности, причём отрезки AC и BC пересекают окружность в точках M и N соответственно. K -- точка пересечения хорд AN и BM. Найдите угол между прямыми AB и CK. From 1081222bba785d388ac5c16d3c654a30af88c152 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:25:24 +0300 Subject: [PATCH 06/35] Create quadrangle-perpendicular-degrees.txt --- test/input/quadrangle-perpendicular-degrees.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/quadrangle-perpendicular-degrees.txt diff --git a/test/input/quadrangle-perpendicular-degrees.txt b/test/input/quadrangle-perpendicular-degrees.txt new file mode 100644 index 0000000..c3670b3 --- /dev/null +++ b/test/input/quadrangle-perpendicular-degrees.txt @@ -0,0 +1 @@ +Серединный перпендикуляр к стороне CD выпуклого четырёхугольника ABCD пересекает диагональ AC в точке O, равноудалённой от прямых AD, AB и BC. Найдите углы четырёхугольника, если Date: Mon, 18 Sep 2017 10:27:42 +0300 Subject: [PATCH 07/35] Create triangle-unnamed -destance-orthocenter.txt --- test/input/triangle-unnamed -destance-orthocenter.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-unnamed -destance-orthocenter.txt diff --git a/test/input/triangle-unnamed -destance-orthocenter.txt b/test/input/triangle-unnamed -destance-orthocenter.txt new file mode 100644 index 0000000..f88705a --- /dev/null +++ b/test/input/triangle-unnamed -destance-orthocenter.txt @@ -0,0 +1 @@ +Докажите, что расстояние от вершины треугольника до его ортоцентра вдвое больше, чем расстояние от точки пересечения серединных перпендикуляров до противоположной стороны. From 57b08056845a27cf963fa77d32cfb77c8a5636c1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:31:47 +0300 Subject: [PATCH 08/35] Create circle-tangent-cross-angle.txt --- test/input/circle-tangent-cross-angle.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/circle-tangent-cross-angle.txt diff --git a/test/input/circle-tangent-cross-angle.txt b/test/input/circle-tangent-cross-angle.txt new file mode 100644 index 0000000..1463d21 --- /dev/null +++ b/test/input/circle-tangent-cross-angle.txt @@ -0,0 +1 @@ +Из точки M к окружности с центром в точке O проведены касательные MA и MB (A и B -- точки касания). Перпендикуляр BF к отрезку MA пересекает MO в точке K, MO = 2OB. Найдите угол KAB. From 4999fd67c983a6295aae981fed83e3e698e56d0c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:33:54 +0300 Subject: [PATCH 09/35] Create triangle-medians-indexed-respectively.txt --- test/input/triangle-medians-indexed-respectively.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-medians-indexed-respectively.txt diff --git a/test/input/triangle-medians-indexed-respectively.txt b/test/input/triangle-medians-indexed-respectively.txt new file mode 100644 index 0000000..80b91dd --- /dev/null +++ b/test/input/triangle-medians-indexed-respectively.txt @@ -0,0 +1 @@ +В треугольнике ABC медианы BB1 и CC1 взаимно перпендикулярны, равны сответственно 36 и 15 и пересекаются в точке M. Найдите MA. From 62009b3fee1a7ca69487469bd75b547a01a706ab Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:36:25 +0300 Subject: [PATCH 10/35] Create triangle-medians-respectively-square.txt --- test/input/triangle-medians-respectively-square.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-medians-respectively-square.txt diff --git a/test/input/triangle-medians-respectively-square.txt b/test/input/triangle-medians-respectively-square.txt new file mode 100644 index 0000000..fae9816 --- /dev/null +++ b/test/input/triangle-medians-respectively-square.txt @@ -0,0 +1 @@ +Медианы AM и CN треугольника ABC равны соответственно 18 и 24; сторона AC равна 20. Найдите площадь треугольника. From 8da887379380b9d153a9e3dc8e252fbc6b1b1da5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:37:10 +0300 Subject: [PATCH 11/35] Rename triangle-unnamed -destance-orthocenter.txt to triangle-unnamed-distance-orthocenter.txt --- ...-orthocenter.txt => triangle-unnamed-distance-orthocenter.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/input/{triangle-unnamed -destance-orthocenter.txt => triangle-unnamed-distance-orthocenter.txt} (100%) diff --git a/test/input/triangle-unnamed -destance-orthocenter.txt b/test/input/triangle-unnamed-distance-orthocenter.txt similarity index 100% rename from test/input/triangle-unnamed -destance-orthocenter.txt rename to test/input/triangle-unnamed-distance-orthocenter.txt From b4880a7db780dbe74ebbd2adec9edf649f2aaac1 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 10:52:37 +0300 Subject: [PATCH 12/35] Create circle-opposite-multitask.txt --- test/input/circle-opposite-multitask.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/circle-opposite-multitask.txt diff --git a/test/input/circle-opposite-multitask.txt b/test/input/circle-opposite-multitask.txt new file mode 100644 index 0000000..4755580 --- /dev/null +++ b/test/input/circle-opposite-multitask.txt @@ -0,0 +1 @@ +Две равные окружности радиусом 6,5 пересекаются в точках P и Q. A и C -- точки окружностей, диаметрально противоположные P. На дуге AP, не содержащей Q, отмечена точка M, и на продолжении отрезка AM выбрана точка B так, что AM = MB. K -- точка пересечения BC со второй окружностью. а) Докажите, что Q -- середина отрезка AC. б) Найдите длину BC, если PK = 5. From dec1696a853d86f66e10f4bc144c3a3929ebc916 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 11:02:33 +0300 Subject: [PATCH 13/35] Create triangle-least-incentre.txt --- test/input/triangle-least-incentre.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-least-incentre.txt diff --git a/test/input/triangle-least-incentre.txt b/test/input/triangle-least-incentre.txt new file mode 100644 index 0000000..cc6e5d5 --- /dev/null +++ b/test/input/triangle-least-incentre.txt @@ -0,0 +1 @@ +В треугольнике ABC сторона AC наименьшая. На сторонах AB и CB взяты точки K и L соответственно так, что KA = AC = CL. Пусть M -- точка пересечения AL и KC, а I -- инцентр треугольника ABC. Докажите, что прямая MI перпендикулярна прямой AC. From 601c4543c362596d6ed021fe3b326426960215ab Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 11:05:36 +0300 Subject: [PATCH 14/35] Create triangle-straight-centroid.txt --- test/input/triangle-straight-centroid.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-straight-centroid.txt diff --git a/test/input/triangle-straight-centroid.txt b/test/input/triangle-straight-centroid.txt new file mode 100644 index 0000000..b88c43f --- /dev/null +++ b/test/input/triangle-straight-centroid.txt @@ -0,0 +1 @@ +В треугольнике MNP угол N прямой, MN = 6, NP = 3. Точка K лежит на стороне MP, A и B -- центроиды треугольников MNK и KNP соответственно. Найлите площадь треугольника NAB. From e25e3809f15953289c543017ff39c04bef353dca Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 11:09:18 +0300 Subject: [PATCH 15/35] Create triangle-medans-indexed-beyond.txt --- test/input/triangle-medans-indexed-beyond.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-medans-indexed-beyond.txt diff --git a/test/input/triangle-medans-indexed-beyond.txt b/test/input/triangle-medans-indexed-beyond.txt new file mode 100644 index 0000000..9266984 --- /dev/null +++ b/test/input/triangle-medans-indexed-beyond.txt @@ -0,0 +1 @@ +BB1 и CC1 -- медианы треугольника ABC. На продолжении CC1 за точкой C1 отложен отрезок C1C2, равный CC1/3. Оказалось, что C2B = AB1. Найдите угол между прямыми CC1 и BB1. From 1b2ae1df16bbbf2354da113d99f6c06fa0c30b37 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 18 Sep 2017 11:12:07 +0300 Subject: [PATCH 16/35] Create triangle-centroid-unnamed-respectively.txt --- test/input/triangle-centroid-unnamed-respectively.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test/input/triangle-centroid-unnamed-respectively.txt diff --git a/test/input/triangle-centroid-unnamed-respectively.txt b/test/input/triangle-centroid-unnamed-respectively.txt new file mode 100644 index 0000000..a298551 --- /dev/null +++ b/test/input/triangle-centroid-unnamed-respectively.txt @@ -0,0 +1 @@ +Через центроид треугольника ABC проходит прямая, пересекающая AB и AC. Расстояния от вершин B и C до этой прямой равны a и b соответственно. Найдите расстояние от вершины A до этой прямой. From 1e2aff8330e6712748997f2385c6c4ec98c454a6 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Mon, 18 Sep 2017 18:38:24 +0300 Subject: [PATCH 17/35] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=20=D0=B2=20test/data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/{ => data}/input/circle-chords-angle.txt | 0 test/{ => data}/input/circle-opposite-multitask.txt | 0 test/{ => data}/input/circle-tangent-cross-angle.txt | 0 test/{ => data}/input/quadrangle-perpendicular-degrees.txt | 0 test/{ => data}/input/triangle-bisectors-cross.txt | 0 test/{ => data}/input/triangle-centroid-unnamed-respectively.txt | 0 test/{ => data}/input/triangle-least-incentre.txt | 0 test/{ => data}/input/triangle-medans-indexed-beyond.txt | 0 test/{ => data}/input/triangle-medians-indexed-respectively.txt | 0 test/{ => data}/input/triangle-medians-perpendicular-indexed.txt | 0 test/{ => data}/input/triangle-medians-point.txt | 0 test/{ => data}/input/triangle-medians-respectively-square.txt | 0 test/{ => data}/input/triangle-quadrangle-medians-cross-square | 0 test/{ => data}/input/triangle-straight-centroid.txt | 0 test/{ => data}/input/triangle-unnamed-distance-orthocenter.txt | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename test/{ => data}/input/circle-chords-angle.txt (100%) rename test/{ => data}/input/circle-opposite-multitask.txt (100%) rename test/{ => data}/input/circle-tangent-cross-angle.txt (100%) rename test/{ => data}/input/quadrangle-perpendicular-degrees.txt (100%) rename test/{ => data}/input/triangle-bisectors-cross.txt (100%) rename test/{ => data}/input/triangle-centroid-unnamed-respectively.txt (100%) rename test/{ => data}/input/triangle-least-incentre.txt (100%) rename test/{ => data}/input/triangle-medans-indexed-beyond.txt (100%) rename test/{ => data}/input/triangle-medians-indexed-respectively.txt (100%) rename test/{ => data}/input/triangle-medians-perpendicular-indexed.txt (100%) rename test/{ => data}/input/triangle-medians-point.txt (100%) rename test/{ => data}/input/triangle-medians-respectively-square.txt (100%) rename test/{ => data}/input/triangle-quadrangle-medians-cross-square (100%) rename test/{ => data}/input/triangle-straight-centroid.txt (100%) rename test/{ => data}/input/triangle-unnamed-distance-orthocenter.txt (100%) diff --git a/test/input/circle-chords-angle.txt b/test/data/input/circle-chords-angle.txt similarity index 100% rename from test/input/circle-chords-angle.txt rename to test/data/input/circle-chords-angle.txt diff --git a/test/input/circle-opposite-multitask.txt b/test/data/input/circle-opposite-multitask.txt similarity index 100% rename from test/input/circle-opposite-multitask.txt rename to test/data/input/circle-opposite-multitask.txt diff --git a/test/input/circle-tangent-cross-angle.txt b/test/data/input/circle-tangent-cross-angle.txt similarity index 100% rename from test/input/circle-tangent-cross-angle.txt rename to test/data/input/circle-tangent-cross-angle.txt diff --git a/test/input/quadrangle-perpendicular-degrees.txt b/test/data/input/quadrangle-perpendicular-degrees.txt similarity index 100% rename from test/input/quadrangle-perpendicular-degrees.txt rename to test/data/input/quadrangle-perpendicular-degrees.txt diff --git a/test/input/triangle-bisectors-cross.txt b/test/data/input/triangle-bisectors-cross.txt similarity index 100% rename from test/input/triangle-bisectors-cross.txt rename to test/data/input/triangle-bisectors-cross.txt diff --git a/test/input/triangle-centroid-unnamed-respectively.txt b/test/data/input/triangle-centroid-unnamed-respectively.txt similarity index 100% rename from test/input/triangle-centroid-unnamed-respectively.txt rename to test/data/input/triangle-centroid-unnamed-respectively.txt diff --git a/test/input/triangle-least-incentre.txt b/test/data/input/triangle-least-incentre.txt similarity index 100% rename from test/input/triangle-least-incentre.txt rename to test/data/input/triangle-least-incentre.txt diff --git a/test/input/triangle-medans-indexed-beyond.txt b/test/data/input/triangle-medans-indexed-beyond.txt similarity index 100% rename from test/input/triangle-medans-indexed-beyond.txt rename to test/data/input/triangle-medans-indexed-beyond.txt diff --git a/test/input/triangle-medians-indexed-respectively.txt b/test/data/input/triangle-medians-indexed-respectively.txt similarity index 100% rename from test/input/triangle-medians-indexed-respectively.txt rename to test/data/input/triangle-medians-indexed-respectively.txt diff --git a/test/input/triangle-medians-perpendicular-indexed.txt b/test/data/input/triangle-medians-perpendicular-indexed.txt similarity index 100% rename from test/input/triangle-medians-perpendicular-indexed.txt rename to test/data/input/triangle-medians-perpendicular-indexed.txt diff --git a/test/input/triangle-medians-point.txt b/test/data/input/triangle-medians-point.txt similarity index 100% rename from test/input/triangle-medians-point.txt rename to test/data/input/triangle-medians-point.txt diff --git a/test/input/triangle-medians-respectively-square.txt b/test/data/input/triangle-medians-respectively-square.txt similarity index 100% rename from test/input/triangle-medians-respectively-square.txt rename to test/data/input/triangle-medians-respectively-square.txt diff --git a/test/input/triangle-quadrangle-medians-cross-square b/test/data/input/triangle-quadrangle-medians-cross-square similarity index 100% rename from test/input/triangle-quadrangle-medians-cross-square rename to test/data/input/triangle-quadrangle-medians-cross-square diff --git a/test/input/triangle-straight-centroid.txt b/test/data/input/triangle-straight-centroid.txt similarity index 100% rename from test/input/triangle-straight-centroid.txt rename to test/data/input/triangle-straight-centroid.txt diff --git a/test/input/triangle-unnamed-distance-orthocenter.txt b/test/data/input/triangle-unnamed-distance-orthocenter.txt similarity index 100% rename from test/input/triangle-unnamed-distance-orthocenter.txt rename to test/data/input/triangle-unnamed-distance-orthocenter.txt From a00c344276ff9f1ad60cf7dfbc93085d27cfae9d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 19 Sep 2017 00:45:04 +0300 Subject: [PATCH 18/35] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-cross-square => triangle-quadrangle-medians-cross-square.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/data/input/{triangle-quadrangle-medians-cross-square => triangle-quadrangle-medians-cross-square.txt} (100%) diff --git a/test/data/input/triangle-quadrangle-medians-cross-square b/test/data/input/triangle-quadrangle-medians-cross-square.txt similarity index 100% rename from test/data/input/triangle-quadrangle-medians-cross-square rename to test/data/input/triangle-quadrangle-medians-cross-square.txt From 070c206e33b5d83a48b9ef8f6b4bedf0c22f962e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 22 Sep 2017 14:06:20 +0300 Subject: [PATCH 19/35] Create facttypes.proto --- tomita/facttypes.proto | 1 + 1 file changed, 1 insertion(+) create mode 100644 tomita/facttypes.proto diff --git a/tomita/facttypes.proto b/tomita/facttypes.proto new file mode 100644 index 0000000..1d427e6 --- /dev/null +++ b/tomita/facttypes.proto @@ -0,0 +1 @@ +// write here fact types From 4912405928c61f80e738e6238994d2bb9cc538ce Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 22 Sep 2017 16:35:12 +0300 Subject: [PATCH 20/35] Rename tomita/facttypes.proto to extract/facttypes.proto --- {tomita => extract}/facttypes.proto | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {tomita => extract}/facttypes.proto (100%) diff --git a/tomita/facttypes.proto b/extract/facttypes.proto similarity index 100% rename from tomita/facttypes.proto rename to extract/facttypes.proto From 7b62ef3e7a51ee589240869f8c6a767fbd204a64 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 22 Sep 2017 16:38:26 +0300 Subject: [PATCH 21/35] Create config.proto --- extract/config.proto | 1 + 1 file changed, 1 insertion(+) create mode 100644 extract/config.proto diff --git a/extract/config.proto b/extract/config.proto new file mode 100644 index 0000000..43b24cc --- /dev/null +++ b/extract/config.proto @@ -0,0 +1 @@ +// write configuration here From 53624ba15e0dcb048ea782902fc3958133af30cb Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 22 Sep 2017 16:49:55 +0300 Subject: [PATCH 22/35] Create Readme.md --- extract/Readme.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 extract/Readme.md diff --git a/extract/Readme.md b/extract/Readme.md new file mode 100644 index 0000000..d6d1f6e --- /dev/null +++ b/extract/Readme.md @@ -0,0 +1 @@ +To get facts from file run `tomitaparser config.proto` From a2fa75f9b5cc69dabb21a94d6a84bd22a85de76b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 22 Sep 2017 17:39:34 +0300 Subject: [PATCH 23/35] Update Readme.md --- extract/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extract/Readme.md b/extract/Readme.md index d6d1f6e..c1a5c53 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1 +1 @@ -To get facts from file run `tomitaparser config.proto` +To get facts from file run `tomitaparser config.proto < $file` From 5f2c032cf9c841bdc81badfcd4b51d9d00d8c082 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Sat, 23 Sep 2017 21:00:28 +0300 Subject: [PATCH 24/35] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20tomita.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пример может выделить точки с их именми. --- extract/Point.bin | Bin 0 -> 1474 bytes extract/Point.cxx | 5 + extract/Readme.md | 2 +- extract/config.proto | 20 ++- extract/extract | 1 + extract/extract.bat | 3 + extract/facttypes.proto | 7 +- extract/mydic.gzt | 9 ++ extract/mydic.gzt.bin | Bin 0 -> 10982 bytes extract/pr.html | 132 ++++++++++++++++++ .../triangle-quadrangle-medians-cross-square | 1 - test/data/output/triangle-medians-point.xml | 2 + 12 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 extract/Point.bin create mode 100644 extract/Point.cxx create mode 100644 extract/extract create mode 100644 extract/extract.bat create mode 100644 extract/mydic.gzt create mode 100644 extract/mydic.gzt.bin create mode 100644 extract/pr.html delete mode 100644 test/data/input/triangle-quadrangle-medians-cross-square create mode 100644 test/data/output/triangle-medians-point.xml diff --git a/extract/Point.bin b/extract/Point.bin new file mode 100644 index 0000000000000000000000000000000000000000..6a0e5ebe879984e3d4e577d665b3039d025b10e2 GIT binary patch literal 1474 zcmXw3U2GIp6#nkaY&$^P*>(#;sLYn`x`o1~KeS6p#jTVrgtpXnfdnk=-Pyal6K7}E z*;(k;pMVMR#RLowMib&jiEo;|8A-qgOjKfG@j+fps4q%1(Y{m@Lab*Non+?BJ@cJ& zzwf(ew-La^+T+^_#l%lXzF`z=>$fs~+(h@ZW7=NaSX>O#f+uplMqmH%P^RBFI53bC zi30;Uo*3>M8t6;(Cx#}@#t-;~xFiB>_aGS70vavTla5;|OmfdC%v3C~HH5W>BfMmK z+%lKAXF7Juv^?Q%*@4f;U0y7T;;isA4Q=J!Xl)50V+qqJh&He&$`jnqS9m^zU@(eW z+IdCT=8`yBT0pqGxgE7x!Cj+pLR6I&BxgiURdH$5^-RMO9ZeV*U-J6!aXfv-w6aII zn{9=31A#C$p6Mj2dB@3HB3^PG&&gDBaUv$hMA>l7lIOU@sw;|?;PeRecnoMb2B`}h zIJ)QwyG%M}h?~&+q3Mw>;9SZSR`x8kn_wr7+LdAqdiP1%C5G|S+^VdDeG2`#eSkG9 z+zY0$7kYFr@baYa3eG3cckUsu!{i%G-=zcDNl`BIJd^N{wJfuUupTmvlg+D;IrK0m zv<|ibIRfnpnEW^7-O!&+0n(q4JE89*jdxGkbf&^Bxxy2l;c9$}7sWJpxg=@50Q*O( zO^9NVAGdQ(%Wsk~T3H-3jVBUogOTR>yl~rS6r{`P*@|mZ=`itfvcigoFr9MTV%s>H zyATX*13tvh>4GTpid!ikwLQ0*LEtNCdcrJw&3o|bXeQ%|3#Ovrp1eGj;)a*5mP9coMOoeP{aE0KcUur zE1}o?!7d@W>+bvSsz^(;+7tykn6xvXZG|FHW(+}?&=hoP5;R;V+i9Y(+(_V2yL!fP zv!Qw}gwlv8mb~g=4Go0ph4vn%$*#Z|ro4&fRv)Fa>o`T_*e})YzqNAb{@W|JR+g{f z+Kb9zWn4L=^d6G51ha7yP|zA7#yZokBS6X1xW_OhUyV$Oi!+YneSnKTmk}lTeP*pk zCAz>zewm-W1N_RM`b+i;lfxhx^sbHof5^&TGU@scsY30B5=2uk)CJ!@bo-yEn?mo4 zenv?HG|&=Wq72Txqad$@!*dZ}NeRVPeg{G8$2>;}6%tCX)VNql&Sn-ej<~ zZq*yWcmBEI5xH8Y+W}=n^6lJSFD1{&2J({ZA@S7rSRF?8kcE_d9VEifC+h;AKHEuD feNVzrtH+FdT>!rQVkku>&`>oYK;e>~z|-qr8m%@r literal 0 HcmV?d00001 diff --git a/extract/Point.cxx b/extract/Point.cxx new file mode 100644 index 0000000..b08e70b --- /dev/null +++ b/extract/Point.cxx @@ -0,0 +1,5 @@ +#encoding "utf-8" + +PointName -> AnyWord; + +Point -> "точка" PointName interp(Point.Name); diff --git a/extract/Readme.md b/extract/Readme.md index c1a5c53..d93f1ce 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1 +1 @@ -To get facts from file run `tomitaparser config.proto < $file` +To get facts from file in test\data\input run `extract $file` in **this** directory \ No newline at end of file diff --git a/extract/config.proto b/extract/config.proto index 43b24cc..b484bcc 100644 --- a/extract/config.proto +++ b/extract/config.proto @@ -1 +1,19 @@ -// write configuration here +encoding "utf-8"; + +TTextMinerConfig { + Dictionary = "mydic.gzt"; + + PrettyOutput = "pr.html"; + + Articles = [ + { Name = "точка" } + ] + + Facts = [ + { Name = "Point" } + ] + + Output = { + Format = xml; + } +} diff --git a/extract/extract b/extract/extract new file mode 100644 index 0000000..c857270 --- /dev/null +++ b/extract/extract @@ -0,0 +1 @@ +tomitaparser config.proto < ../test/data/input/$0 > ../test/data/output/$(basename $0).xml \ No newline at end of file diff --git a/extract/extract.bat b/extract/extract.bat new file mode 100644 index 0000000..d6e025a --- /dev/null +++ b/extract/extract.bat @@ -0,0 +1,3 @@ +@echo off + +tomitaparser config.proto < ..\test\data\input\%1 > ..\test\data\output\%~n1.xml diff --git a/extract/facttypes.proto b/extract/facttypes.proto index 1d427e6..0d0fee7 100644 --- a/extract/facttypes.proto +++ b/extract/facttypes.proto @@ -1 +1,6 @@ -// write here fact types +import "base.proto"; +import "facttypes_base.proto"; + +message Point : NFactType.TFact { + optional string Name = 1; +} diff --git a/extract/mydic.gzt b/extract/mydic.gzt new file mode 100644 index 0000000..49bee7d --- /dev/null +++ b/extract/mydic.gzt @@ -0,0 +1,9 @@ +encoding "utf-8"; + +import "base.proto"; +import "articles_base.proto"; +import "Facttypes.proto"; + +TAuxDicArticle "точка" { + key = { "tomita:Point.cxx" type=CUSTOM } +} diff --git a/extract/mydic.gzt.bin b/extract/mydic.gzt.bin new file mode 100644 index 0000000000000000000000000000000000000000..504dce23d720088290dd9649e2407b2dce749604 GIT binary patch literal 10982 zcmcgSOKclia%z4g@=>B%Ez9Q6KbfBKXf!rOQ4%R>@)?S1$sF;ckj?ST01HmD`;qD~ z*<`w#wq*p#WU)amSs;hKZo0-;* zve|@zloI1ell;odZqWi7tn>cZ9?f(%wbR_mZf|BcGkdMpuAI$mL0=}F*~w&7754a? z?7!?DkDpHNklNkcQJbmMwwh|mbX!$Yds&)JwbI$dR8GfcNRixAdb(w3&5e%MG&dOAnuFGcN=?Pk`c}_y zv8A?@y}ecn{@czpQ%z+H_?m8RWwOf7PPUm&0TI7W-cmIXQ(JycEsKJrMrEOFZ>wr+ zXHRWq_BOLSs=C+QQdL>q+u5bfz1=Jz*dXEVIiN_kpIgGJx~pX9p1Paf+1-{E892O^ zX>MoaOeU+Q>9!o35qPWD)hv1cw5RD-QhD}F_+gPON~NCBKP$5N9D;||r7GwQS#rJ}622Xfo(;3cW|nCjYd zTInNJlMty!WkWeTq30wZRcVWaq@1mm3@kCQ5=DjmMuSBi0-UM~m$EP84T`}AmA1qPR z1c|%jH^#>q1KiOG)OaR$aCLm?@WAejiOrpZy5l#;G1v!mhwqOM*LAoP)aV=3qK={^ z%W{{35uKtyQ)Yuc7iqUE7xY$-M5Wx|*`cPm`W%%cx!tCQ+rBN;28Isk*^*LErJbbP zb<{JuL~vUd6UefJ1W9Mqln2JZ6u}am!%joJENZ4j7NlIWY0xJcySrqujD}7EGn|wV zBGJ(ft>>9=C|i{HThO}<|23X!pb`VCVcMjUfQsX@Af_hR1A?uFawcm!Ay%jHL^d>8 zw@5(m>6C;J0UnS<5$em9(bLbnnnEJj)^w%U?RQ9!nId6(hV%IY!P&V`m_+6mqKo{J zuzY3Z>b2Ng@#{Bk-nzYdCvo@fckaEr_TKvY_a7uTQk&^}@xNWV#DXTi%}tm#;cXH? zn;+v=eQVM5)#RAzONz)SVV(q@_6#-VTlKFkBt9TPyE{sV_(?7=HI6FP5kZ`V8 zWUU&{3Cm;=n?CO&k2hpGTIRmmdJu)eHRMn%gmmUlu@#I|tHBjgv)^NRbQ{2(Z{9(1%`J^>vCpjyXE2Y^^U2K@x! zv{D4^1mI!441xlneo_S~0dNdboJHWMTIS~vka7|qLg1iS1-1illKYG&2;_l{1yT^ILr10F({WE>^~MOe1=V^=J+fEXh(Jv zUvgw3C=|9x5PYH51vA3IO}>^K4;$^fydQb=upo&I5K&%CWZjz#w`Zi^w$bHExsfZv z#RGK#6P|yVt2Xk*T&>3Y5?}d7qfj*b7JX*fCQP_Zf?bS^nIDLx`EhR{+#-QCgv2ql zschUE6Qj3LAiIhM*f@9_uPwJDWw3mHxX`g6o3uD)xrBAcu+6&c7{<&=5d!Btq$5Sv3F*K5nK#1c;{Oh5RkN*<>`4a!bp%)nj z^uTv=NL%utW5EF#PVZ7-l?XLRwWt$JNty+TEJ%r43+)FiV?c!z3A;Ii3F5({-UQAL z_n1g2gli-W0d!w(Lr@b_FHprBprkG?CwRok;xh=QFj8X#y8Fh-yhBuN&@?R%O;^cW zPCtKyfdx_&+7Gtmj!ENR-hAn-a&atZO&pV@iEKwmlRyiibcgA0PvkY;6)bH?eB&d_ zQ~L2nU=YU+iOy-RFDs8B#Ahc93m|uu_NlH?T{&m>APf=8eAmtc8Z6ebwSRSjjIkU? z$dWLH(9&LH--b!rF%1}BxJ%|tJIRU7GR=Q?VlO8*m|Pi#>ux7?&aHW8V(ql7O?W`& zdUhJ?+@u>*)(tbI#Gm@f;`ruX)^3wv3)4f#*t{eeyTG&I0qn!SLIm_R!gZ)1XSV~iThyWwsRSwF{a_U#D_-aIsZpF~BMODuN> zClxd;*+5Irtpy<@@`DaDoen0x7bI7v%G@iksGA6}+Z+`3Nw6a~X$P!5I%Q;6hT zoF%bV%N>gl(z#?Ed@6}Gi0nqmf-M$?TZkAfL@_*PJJybnESRx4)&-RELo78o9L!nr zbifQDk%u&j$yp%LV(vgJHY%r5p;FEjfp^2cs`wlA0%Q@uzmdLE5ps${@U(xxk>zRD z&#RTYBxs8mbJs}vy$OjTifIo=qZZ9}n3EO_*SgBkA+Z;t@{)9MQP4vN!95M{uf5To z7Zd63_JE_=vw?C8A-+*9AVMvaP1)TB{y_IFA89kMbVm6ss!kec3y zM-=7@kpp3PDTu(c%CHkR3=10D9LV_%_(JlmATE9aZ7&w?Q0)uXRA{>$V9=N(Lyxcb6 z=^++|!RQpt8lfeLG~oh#*xC=)PDSxhxI>l|rO~E3H8iDR+8*1C@oXKIb*?06jhSuXbcS>9M9f=Oy;Z{OB<-on{AtI}4^LUpa*A zqW~$74=qg*laXq@EEP&3?_Upx{%y{QZvUDiQLjIOH29huA(_;IXEuXzwkzBIXvp~_ zxvlpa;HY#J9={vv@J+iRD++{IAPhU`wIfO4bsT$?^zZq|Jo8$}2Y9hZAEz)qwv)5F z6B;@?JDEpku|I1YXfVFBsF~DuvmxOv7CIVKfq>f^5u?u1XMIqUE~GYcr_q)B4a_1? z^TMy?l!*-zWaMEo<9Lu6OmXs+>LCaiBx?6IP77ilWIW22Z$XB1VF_OgJ)`KGgdbW~ zm+`M#vY(Tv*POlfQ#8ne=fVB8Z}7*Eu}rzP!Us;qVmrVG6Dm4o&G4Nc(p6rAT*lH` z8dyu)liKDvPK18X)GX}@g~w~l8AD4Q5MWHFkT`nBFqreBRaSe0CYV+m8^&lH_L@*e z)Y~Hg**v6`i%=vm5S2Tfnd$fz3E|5>mLebm38MiAGta_TAKVDQrkRalcnwCuw-!2h z5A1EPJAVEHek{B;A9C^U&%ILNIR4@~CceUt)I~;KSnw(@lTa7R2hL+Vx3;j)ZNj7K ztlW7jpWBK1&=_8aLqeXZbTnNCcCs*gICvAB=fGl*G066@=i|h0kJn>f{4Oz_rZ@!m zSle;l65t_YSn2_(g*saM%xXM->LChVIEdo|K7su`^`A@j2a8lUsd~Z++fGUiw)2D< zI!iA6YvB>hf5uI#6kVYA0WU_MUC<1hgH}s>#Z=Gmtd$%n0cYd%N{0^sDk&YRWh zuqbs=h8lL^>j&gk^KPXI+avg~#u7$>GqIpfh7-RFLF|+w)+O}1(G*+H-WwpW&9cpdO!j>=o z&%Rgu93woe2F73V(}u(n39?EeXd&n5_beoaM_Mm22SZpxTtAttFM)G~msk-FglQPo zkL;QT%N|*2$!@dkF`p|zmc%L`{{0dO>7ZKplqy`FqQ<`SU9{HGbUZmc*LVeO{{abT zP@?^1sD6*33dR2@{3>6gTw)sIukx)3k}3<&vVhI+SdP%9ZQ@~tp>l5t-r8q z&TnL|j{BhVMt19u*3aM6ju%z>H?kv`1^gBup)&Q4`(WqS$h_4b3KZS@mbq_HAa(o^vJQigN5U@Q<{EUNA z&rEy~+?-o9kqnI{A|%YB3T&*ylG8H-Ogy&IQ8J&0??ZY6UB&kPZxPTX!8bD_IKOe{ zH{txQJHKh?cmKLGpX1^jm*BW{j!SdgKF1w!+(*u&s`LAg{xF$?=L>itG5_7qLvEzO zw<&IU$vhAU?@}W|7zp`+`4J%@Eaf0|zxaor{rOk_@$&@&-(ueR)qlAgf!`5s+=b@R zt?zzw`zpCYCceN+`N>be{qQ z7U0*zTX$d%0Ow#=0Q|4-4E_^`@E&i*fusabFU literal 0 HcmV?d00001 diff --git a/extract/pr.html b/extract/pr.html new file mode 100644 index 0000000..892a52e --- /dev/null +++ b/extract/pr.html @@ -0,0 +1,132 @@ + +

M +   + и +   + N +   + - +   + - +   + соответственно +   + середины +   + сторон +   + BC +   + и +   + AC +   + треугольника +   + ABC +   + ; +   + точка +   + F +   + отмечена +   + так +   + , +   + что +   + FM +   + _ +   + | +   + BC +   + , +   + FN +   + _ +   + | +   + AC +   + . +   + EOS 

Найдите +   + расстояние +   + от +   + точки +   + F +   + до +   + прямой +   + AB +   + , +   + если +   + AB +   + = +   + 16 +   + , +   + CF +   + = +   + 10 +   + . +   + EOS 

+ + + + + +
Point
Name
F
F
+ + + + + + + + + + + + + +
TextType
точка FTAuxDicArticle [точка]
точка FTAuxDicArticle [точка]
+ diff --git a/test/data/input/triangle-quadrangle-medians-cross-square b/test/data/input/triangle-quadrangle-medians-cross-square deleted file mode 100644 index a818bee..0000000 --- a/test/data/input/triangle-quadrangle-medians-cross-square +++ /dev/null @@ -1 +0,0 @@ -O -- точка пересечения медиан BD и CE треугольника ABC. Найдите площадь четырёхугольника AEOD, если площадь трегольника ABS равна S. diff --git a/test/data/output/triangle-medians-point.xml b/test/data/output/triangle-medians-point.xml new file mode 100644 index 0000000..2e8c241 --- /dev/null +++ b/test/data/output/triangle-medians-point.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From 242fde1c3f9b33365cb7976ee3364fb5d3831415 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 29 Sep 2017 23:02:37 +0300 Subject: [PATCH 25/35] Update extract --- extract/extract | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extract/extract b/extract/extract index c857270..d231ef0 100644 --- a/extract/extract +++ b/extract/extract @@ -1 +1 @@ -tomitaparser config.proto < ../test/data/input/$0 > ../test/data/output/$(basename $0).xml \ No newline at end of file +tomitaparser config.proto < ../test/data/input/$0 > ../test/data/output/$(basename $0 .txt).xml From 5fc123ec07f7d7e009d40f61429492e52fd4a667 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:06:19 +0300 Subject: [PATCH 26/35] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=20extract,=20=D1=81=D1=8D=D0=BC=D1=83=D0=BB=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=B2=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?= =?UTF-8?q?=20=D1=82=D0=BE=D0=BC=D0=B8=D1=82=D1=8B=20=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D1=84=D0=BE=D0=BD=D0=B5=20(=D0=BD=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B5=20=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=B5=D1=82,=20=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20?= =?UTF-8?q?=D0=BF=D0=B8=D1=88=D0=B5=D1=82=20=D0=B8=D0=B7=20STDIN=20=D0=B2?= =?UTF-8?q?=20STDOUT),=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/Readme.md | 3 ++- extract/extract | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extract/Readme.md b/extract/Readme.md index d93f1ce..f4e441d 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1 +1,2 @@ -To get facts from file in test\data\input run `extract $file` in **this** directory \ No newline at end of file +To get facts from file in `test\data\input` run `extract $file` (on UNIX run './extract $file`) in **this** directory +`tomitaparser` **have to be** in PATH (`/usr/bin`) diff --git a/extract/extract b/extract/extract index d231ef0..86dc53c 100644 --- a/extract/extract +++ b/extract/extract @@ -1 +1,4 @@ -tomitaparser config.proto < ../test/data/input/$0 > ../test/data/output/$(basename $0 .txt).xml +echo $* +cd $mcode/GeoPlot/extract + +tomitaparser config.proto < ../test/data/input/$1 > ../test/data/output/$(basename $1 .txt).xml From d0813157bffe0f800d8c4c02d3f04b1e6b2075e9 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:07:57 +0300 Subject: [PATCH 27/35] =?UTF-8?q?=D0=97=D0=B0=D0=B1=D1=8B=D0=BB=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20add=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20extract?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/extract | 3 --- 1 file changed, 3 deletions(-) diff --git a/extract/extract b/extract/extract index 86dc53c..11eaa67 100644 --- a/extract/extract +++ b/extract/extract @@ -1,4 +1 @@ -echo $* -cd $mcode/GeoPlot/extract - tomitaparser config.proto < ../test/data/input/$1 > ../test/data/output/$(basename $1 .txt).xml From 7311bea15c31e34ce158ca0b0445c8064b416570 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:15:22 +0300 Subject: [PATCH 28/35] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/Point.bin | Bin 1474 -> 0 bytes extract/mydic.gzt.bin | Bin 10982 -> 0 bytes test/data/output/triangle-medians-point.xml | 2 -- 3 files changed, 2 deletions(-) delete mode 100644 extract/Point.bin delete mode 100644 extract/mydic.gzt.bin delete mode 100644 test/data/output/triangle-medians-point.xml diff --git a/extract/Point.bin b/extract/Point.bin deleted file mode 100644 index 6a0e5ebe879984e3d4e577d665b3039d025b10e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1474 zcmXw3U2GIp6#nkaY&$^P*>(#;sLYn`x`o1~KeS6p#jTVrgtpXnfdnk=-Pyal6K7}E z*;(k;pMVMR#RLowMib&jiEo;|8A-qgOjKfG@j+fps4q%1(Y{m@Lab*Non+?BJ@cJ& zzwf(ew-La^+T+^_#l%lXzF`z=>$fs~+(h@ZW7=NaSX>O#f+uplMqmH%P^RBFI53bC zi30;Uo*3>M8t6;(Cx#}@#t-;~xFiB>_aGS70vavTla5;|OmfdC%v3C~HH5W>BfMmK z+%lKAXF7Juv^?Q%*@4f;U0y7T;;isA4Q=J!Xl)50V+qqJh&He&$`jnqS9m^zU@(eW z+IdCT=8`yBT0pqGxgE7x!Cj+pLR6I&BxgiURdH$5^-RMO9ZeV*U-J6!aXfv-w6aII zn{9=31A#C$p6Mj2dB@3HB3^PG&&gDBaUv$hMA>l7lIOU@sw;|?;PeRecnoMb2B`}h zIJ)QwyG%M}h?~&+q3Mw>;9SZSR`x8kn_wr7+LdAqdiP1%C5G|S+^VdDeG2`#eSkG9 z+zY0$7kYFr@baYa3eG3cckUsu!{i%G-=zcDNl`BIJd^N{wJfuUupTmvlg+D;IrK0m zv<|ibIRfnpnEW^7-O!&+0n(q4JE89*jdxGkbf&^Bxxy2l;c9$}7sWJpxg=@50Q*O( zO^9NVAGdQ(%Wsk~T3H-3jVBUogOTR>yl~rS6r{`P*@|mZ=`itfvcigoFr9MTV%s>H zyATX*13tvh>4GTpid!ikwLQ0*LEtNCdcrJw&3o|bXeQ%|3#Ovrp1eGj;)a*5mP9coMOoeP{aE0KcUur zE1}o?!7d@W>+bvSsz^(;+7tykn6xvXZG|FHW(+}?&=hoP5;R;V+i9Y(+(_V2yL!fP zv!Qw}gwlv8mb~g=4Go0ph4vn%$*#Z|ro4&fRv)Fa>o`T_*e})YzqNAb{@W|JR+g{f z+Kb9zWn4L=^d6G51ha7yP|zA7#yZokBS6X1xW_OhUyV$Oi!+YneSnKTmk}lTeP*pk zCAz>zewm-W1N_RM`b+i;lfxhx^sbHof5^&TGU@scsY30B5=2uk)CJ!@bo-yEn?mo4 zenv?HG|&=Wq72Txqad$@!*dZ}NeRVPeg{G8$2>;}6%tCX)VNql&Sn-ej<~ zZq*yWcmBEI5xH8Y+W}=n^6lJSFD1{&2J({ZA@S7rSRF?8kcE_d9VEifC+h;AKHEuD feNVzrtH+FdT>!rQVkku>&`>oYK;e>~z|-qr8m%@r diff --git a/extract/mydic.gzt.bin b/extract/mydic.gzt.bin deleted file mode 100644 index 504dce23d720088290dd9649e2407b2dce749604..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10982 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 diff --git a/test/data/output/triangle-medians-point.xml b/test/data/output/triangle-medians-point.xml deleted file mode 100644 index 2e8c241..0000000 --- a/test/data/output/triangle-medians-point.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file From a59e084c1512b52cb2363f6fe9065b21aac843c8 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:17:31 +0300 Subject: [PATCH 29/35] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20pr?= =?UTF-8?q?etty=20output?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/pr.html | 132 ------------------------------------------------ 1 file changed, 132 deletions(-) delete mode 100644 extract/pr.html diff --git a/extract/pr.html b/extract/pr.html deleted file mode 100644 index 892a52e..0000000 --- a/extract/pr.html +++ /dev/null @@ -1,132 +0,0 @@ - -

M -   - и -   - N -   - - -   - - -   - соответственно -   - середины -   - сторон -   - BC -   - и -   - AC -   - треугольника -   - ABC -   - ; -   - точка -   - F -   - отмечена -   - так -   - , -   - что -   - FM -   - _ -   - | -   - BC -   - , -   - FN -   - _ -   - | -   - AC -   - . -   - EOS 

Найдите -   - расстояние -   - от -   - точки -   - F -   - до -   - прямой -   - AB -   - , -   - если -   - AB -   - = -   - 16 -   - , -   - CF -   - = -   - 10 -   - . -   - EOS 

- - - - - -
Point
Name
F
F
- - - - - - - - - - - - - -
TextType
точка FTAuxDicArticle [точка]
точка FTAuxDicArticle [точка]
- From 938b4a29a658ca34fd9f64930c5619b3d1540829 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Tue, 3 Oct 2017 11:31:12 +0300 Subject: [PATCH 30/35] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавил .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3ffed8a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.bin +test/data/output/*.xml From 91c99adbbbb9b46c2d24e936e2da8700ae7040ca Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Tue, 3 Oct 2017 11:34:52 +0300 Subject: [PATCH 31/35] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=B0=D0=B1=D1=8B=20=D0=BD=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/config.proto | 22 +++++++++++----------- extract/facttypes.proto | 4 ++-- extract/mydic.gzt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extract/config.proto b/extract/config.proto index b484bcc..ee4465f 100644 --- a/extract/config.proto +++ b/extract/config.proto @@ -1,19 +1,19 @@ encoding "utf-8"; TTextMinerConfig { - Dictionary = "mydic.gzt"; + Dictionary = "mydic.gzt"; - PrettyOutput = "pr.html"; + PrettyOutput = "pr.html"; - Articles = [ - { Name = "точка" } - ] + Articles = [ + { Name = "точка" } + ] - Facts = [ - { Name = "Point" } - ] + Facts = [ + { Name = "Point" } + ] - Output = { - Format = xml; - } + Output = { + Format = xml; + } } diff --git a/extract/facttypes.proto b/extract/facttypes.proto index 0d0fee7..7b50d25 100644 --- a/extract/facttypes.proto +++ b/extract/facttypes.proto @@ -1,6 +1,6 @@ import "base.proto"; import "facttypes_base.proto"; -message Point : NFactType.TFact { - optional string Name = 1; +message Point : NFactType.TFact { + optional string Name = 1; } diff --git a/extract/mydic.gzt b/extract/mydic.gzt index 49bee7d..9ebe2f3 100644 --- a/extract/mydic.gzt +++ b/extract/mydic.gzt @@ -5,5 +5,5 @@ import "articles_base.proto"; import "Facttypes.proto"; TAuxDicArticle "точка" { - key = { "tomita:Point.cxx" type=CUSTOM } + key = { "tomita:Point.cxx" type=CUSTOM } } From a1b5f1ac02a32e52ac173b2250befffc9d01c03f Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:46:37 +0300 Subject: [PATCH 32/35] =?UTF-8?q?Revert=20"=D0=97=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=82=D0=B0=D0=B1=D1=8B=20=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0377ee3b438a93d626bbbebb17895caaf2635f2d. --- extract/config.proto | 22 +++++++++++----------- extract/facttypes.proto | 4 ++-- extract/mydic.gzt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/extract/config.proto b/extract/config.proto index ee4465f..b484bcc 100644 --- a/extract/config.proto +++ b/extract/config.proto @@ -1,19 +1,19 @@ encoding "utf-8"; TTextMinerConfig { - Dictionary = "mydic.gzt"; + Dictionary = "mydic.gzt"; - PrettyOutput = "pr.html"; + PrettyOutput = "pr.html"; - Articles = [ - { Name = "точка" } - ] + Articles = [ + { Name = "точка" } + ] - Facts = [ - { Name = "Point" } - ] + Facts = [ + { Name = "Point" } + ] - Output = { - Format = xml; - } + Output = { + Format = xml; + } } diff --git a/extract/facttypes.proto b/extract/facttypes.proto index 7b50d25..0d0fee7 100644 --- a/extract/facttypes.proto +++ b/extract/facttypes.proto @@ -1,6 +1,6 @@ import "base.proto"; import "facttypes_base.proto"; -message Point : NFactType.TFact { - optional string Name = 1; +message Point : NFactType.TFact { + optional string Name = 1; } diff --git a/extract/mydic.gzt b/extract/mydic.gzt index 9ebe2f3..49bee7d 100644 --- a/extract/mydic.gzt +++ b/extract/mydic.gzt @@ -5,5 +5,5 @@ import "articles_base.proto"; import "Facttypes.proto"; TAuxDicArticle "точка" { - key = { "tomita:Point.cxx" type=CUSTOM } + key = { "tomita:Point.cxx" type=CUSTOM } } From 044ebeaa434e6065b7c4fbc4c12659f0e36b34b3 Mon Sep 17 00:00:00 2001 From: pinbraerts Date: Thu, 5 Oct 2017 20:50:41 +0300 Subject: [PATCH 33/35] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Заменил табы на пробелы и исправил Readme --- extract/Readme.md | 2 +- extract/config.proto | 22 +++++++++++----------- extract/facttypes.proto | 4 ++-- extract/mydic.gzt | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extract/Readme.md b/extract/Readme.md index f4e441d..5f2fd7a 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1,2 +1,2 @@ -To get facts from file in `test\data\input` run `extract $file` (on UNIX run './extract $file`) in **this** directory +To get facts from file in `test\data\input` run `extract $file` (on UNIX run `./extract $file`) in **this** directory `tomitaparser` **have to be** in PATH (`/usr/bin`) diff --git a/extract/config.proto b/extract/config.proto index b484bcc..ee4465f 100644 --- a/extract/config.proto +++ b/extract/config.proto @@ -1,19 +1,19 @@ encoding "utf-8"; TTextMinerConfig { - Dictionary = "mydic.gzt"; + Dictionary = "mydic.gzt"; - PrettyOutput = "pr.html"; + PrettyOutput = "pr.html"; - Articles = [ - { Name = "точка" } - ] + Articles = [ + { Name = "точка" } + ] - Facts = [ - { Name = "Point" } - ] + Facts = [ + { Name = "Point" } + ] - Output = { - Format = xml; - } + Output = { + Format = xml; + } } diff --git a/extract/facttypes.proto b/extract/facttypes.proto index 0d0fee7..7b50d25 100644 --- a/extract/facttypes.proto +++ b/extract/facttypes.proto @@ -1,6 +1,6 @@ import "base.proto"; import "facttypes_base.proto"; -message Point : NFactType.TFact { - optional string Name = 1; +message Point : NFactType.TFact { + optional string Name = 1; } diff --git a/extract/mydic.gzt b/extract/mydic.gzt index 49bee7d..9ebe2f3 100644 --- a/extract/mydic.gzt +++ b/extract/mydic.gzt @@ -5,5 +5,5 @@ import "articles_base.proto"; import "Facttypes.proto"; TAuxDicArticle "точка" { - key = { "tomita:Point.cxx" type=CUSTOM } + key = { "tomita:Point.cxx" type=CUSTOM } } From 4633ca1323da6d0598469f8cebcfd1bc88538f91 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 5 Oct 2017 20:51:56 +0300 Subject: [PATCH 34/35] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BB=D1=8D=D1=88=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extract/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extract/Readme.md b/extract/Readme.md index 5f2fd7a..d9f150e 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1,2 +1,2 @@ -To get facts from file in `test\data\input` run `extract $file` (on UNIX run `./extract $file`) in **this** directory +To get facts from file in `test/data/input` run `extract $file` (on UNIX run `./extract $file`) in **this** directory `tomitaparser` **have to be** in PATH (`/usr/bin`) From d67396e9186a42468b2da6bbbe65dfd54d067da5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 5 Oct 2017 20:52:34 +0300 Subject: [PATCH 35/35] Update Readme.md --- extract/Readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extract/Readme.md b/extract/Readme.md index d9f150e..47c789b 100644 --- a/extract/Readme.md +++ b/extract/Readme.md @@ -1,2 +1,3 @@ -To get facts from file in `test/data/input` run `extract $file` (on UNIX run `./extract $file`) in **this** directory +To get facts from file in `test/data/input` run `extract $file` (on UNIX run `./extract $file`) in **this** directory. + `tomitaparser` **have to be** in PATH (`/usr/bin`)