added modified files

Author: unknown

lib/Constructor/ConstructorSolver.cs

@@ -43,9 +43,10 @@ public SolutionSpec Work()
 			}
 
 			int i = 0;
-			GivenPolygons
-				.OrderByDescending(p => p.GetUnsignedSquare())
-				.First(polygon =>
+			var result = GivenPolygons
+				.OrderByDescending(HasRightAngle)
+				.ThenByDescending(p => p.GetUnsignedSquare())
+				.FirstOrDefault(polygon =>
 				{
 					Console.WriteLine($"{i++}/{GivenPolygons.Length} started");
 					return polygon.Segments.Any(segment => StartWithPolygonSegment(polygon, segment));
@@ -55,6 +56,19 @@ public SolutionSpec Work()
 			return GenerateSolution();
 		}
 
+		private bool HasRightAngle(Polygon polygon)
+		{
+			for (int i = 0; i < polygon.Segments.Length; i++)
+			{
+				var s1 = polygon.Segments[i];
+				var s2 = polygon.Segments[(i + 1)%polygon.Segments.Length];
+				if ((s1.End - s1.Start).ScalarProd(s2.End - s2.Start) == 0)
+					return true;
+			}
+
+			return false;
+		}
+
 		private SolutionSpec GenerateSolution()
 		{
 			var dict = new Dictionary<Vector, int>();
@@ -145,17 +159,19 @@ private bool DoIt()
 
 			foreach (var pair in Vertexes.Where(pair => !Variants.ContainsKey(pair.Key) && !UsedVertexes.Contains(pair.Key)))
 			{
-				var rounds = GetRounds(pair.Key, 1000); //возвращает Null если цикл уже построен
-				if (rounds != null)
+				var rounds = GetRounds(pair.Key, 10); //возвращает Null если цикл уже построен
+				if (rounds != null && rounds.Count <= 10)
 					Variants[pair.Key] = rounds;
-				else
+				else if(rounds == null)
 				{
 					UsedVertexes.Add(pair.Key);
 					continue;
 				}
-				if (Variants[pair.Key].Count == 0)
+				if ((Variants.GetOrDefault(pair.Key)?.Count ?? 0) == 0)
 					return false;
 			}
+			if (Variants.Count == 0)
+				return false;
 
 			var simplest = Variants.Min(v => v.Value.Count);
 			var variant = Variants.First(v => v.Value.Count == simplest);
@@ -248,8 +264,13 @@ private void DoRound(Polygon polygon, Polygon startPolygon, Segment startSegment
 			{
 				if(!SegmentsMatrix.TryAddPolygon(pPolygon))
 					continue;
-				var newSegment = pPolygon.Segments.Where(s => s.Start.Equals(vertex) || s.End.Equals(vertex)).First(s => !s.Equals(segment));
-				
+				var newSegment = pPolygon.Segments.Where(s => s.Start.Equals(vertex) || s.End.Equals(vertex)).FirstOrDefault(s => !s.Equals(segment));
+				if (newSegment == null)
+				{
+					SegmentsMatrix.RemovePolygon(pPolygon);
+					return;
+				}
+
 				stack.Push(pPolygon);
 				DoRound(pPolygon, startPolygon, startSegment, newSegment, result, stack, vertex, maxCount, deep + 1);
 				stack.Pop();

lib/Constructor/SegmentsFinder.cs

@@ -29,8 +29,9 @@ public static List<Polygon> GetRealPolygons(ProblemSpec problem)
 			}
 			foreach (var holePolygon in holePolygons)
 			{
-				var polygon = polygons.Last(p => ArePointsPolygon(p.Vertices, holePolygon));
-				polygons.Remove(polygon);
+				var polygon = polygons.LastOrDefault(p => ArePointsPolygon(p.Vertices, holePolygon));
+				if(polygon != null)
+					polygons.Remove(polygon);
 			}
 
 			return polygons;
@@ -73,6 +74,8 @@ private static IEnumerable<Vector> GeneratePolygon(Segment startSegment, Diction
 					}
 				}
 				segment = best;
+				if(segment == null)
+					yield break;
 				yield return segment.Start;
 				usedSegments.Add(Tuple.Create(segment.Start, segment.End));
 			}

problems/023.response.txt

@@ -1 +1 @@
-{"solution_size":1341,"ok":true,"resemblance":0.905045,"problem_id":23,"solution_spec_hash":"30e2427d8bcfc94e5421f20e5ece3bdd67aa3bf9"}
+{"solution_size":227,"ok":true,"resemblance":1.0,"problem_id":23,"solution_spec_hash":"00f4acb60248e3e1d6dc610a01d1e1418e00de20"}

problems/023.solution.txt

@@ -1,84 +1,32 @@
-31
-446/525,226/525
-439/525,10/21
-724/1575,56/75
-4513/26250,352/625
-79/525,83/210
-598/2625,683/5250
-16621/18945,32906/73675
-6929/8050,791/1725
-395774/447825,214126/447825
-17387/1640625,2016757/3281250
-12871/1430625,150727/953750
-353/1050,0
-1067/1575,0
-1,111614/311325
-1,143692964/249003825
-227089/434700,1
-23939/223650,1
-0,7699513/12340650
-0,5976/13175
-0,9085879619/59939763450
-462977/4629450,0
-325909/1543150,0
-6697/25200,0
-0,51773/591150
-0,3165250583/5158962900
-0,15190417/106262100
-0,343501021/555818550
+12
+1/2,10/21
+1/2,11/21
+43/126,0
+1,19/84
+0,17/42
+1,25/42
+83/126,1
+0,65/84
 1,0
+0,0
 1,1
 0,1
-0,0
-20
-8 11 12 0 1 2 3 4 5
-5 12 27 13 6 0
-3 0 7 1
-6 14 28 15 2 1 8
-6 2 16 29 17 9 3
-5 4 3 18 19 10
-4 20 21 5 4
-3 22 11 5
-3 6 7 0
-3 1 7 8
-4 13 14 8 6
-3 8 7 6
-3 21 22 5
-5 30 20 4 10 23
-4 24 18 3 9
-3 19 25 10
-3 10 25 23
-3 15 16 2
-3 17 26 9
-3 26 24 9
--1/42,0
+6
+4 8 2 0 3
+4 0 4 9 2
+4 5 1 0 3
+4 5 1 6 10
+4 7 1 0 4
+4 11 7 1 6
 1/42,0
-7/18,2/7
-22/75,46/75
-29/210,143/210
--29/210,143/210
-443/53046,0
-0,3/161
 -1/42,0
+-7/18,2/7
+23/84,1/2
+2/21,1/2
+-2/21,1/2
+7/18,2/7
+-23/84,1/2
 29/210,143/210
--29/210,143/210
 -22/75,46/75
--7/18,2/7
-496603/7081606,69720/505829
--956213/6640102,312306/3320051
-490301/1552500,485648/905625
--17293/399375,305219/931875
-102021/822710,143/210
-97186408/874569675,304250641/583046450
--118477441/799196846,2703407383/3995984230
--15026/66135,80527/154315
--1139/4409,13857/22045
--1529341/6638100,46338401/79657200
--13094161/64435350,42049723/64435350
-657467903/5158962900,143/210
--289673509/1930428150,7738221787/11582568900
-23695911/185272850,376017011/555818550
--821237/7463750,5013326/11195625
--1204493/7463750,5784089/11195625
--96729/781250,3265369/8203125
--57757856/207440625,252133541/414881250
+22/75,46/75
+-29/210,143/210

problems/027.response.txt

@@ -1 +1 @@
-{"solution_size":3577,"ok":true,"resemblance":0.764715,"problem_id":27,"solution_spec_hash":"3d4e1f73576697a2bc601f4f9256899db1ff375a"}
+{"solution_size":903,"ok":true,"resemblance":1.0,"problem_id":27,"solution_spec_hash":"70e30ef8289836acbeeb1db3e28bcd1a471d6af8"}