From 7881cef5c3dcea8e6037101db2c3eeb2fd3ba5da Mon Sep 17 00:00:00 2001
From: 826220679@qq.com <826220679@qq.com>
Date: 星期六, 27 十二月 2025 23:42:36 +0800
Subject: [PATCH] 1211

---
 src/lujing/YixinglujingNoObstacle.java |  257 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 234 insertions(+), 23 deletions(-)

diff --git a/src/lujing/YixinglujingNoObstacle.java b/src/lujing/YixinglujingNoObstacle.java
index fd879ad..31e87d5 100644
--- a/src/lujing/YixinglujingNoObstacle.java
+++ b/src/lujing/YixinglujingNoObstacle.java
@@ -1,14 +1,15 @@
 package lujing;
 
 import java.util.*;
-import java.util.Set;
-import java.util.HashSet;
 
 /**
  * 寮傚舰鑽夊湴璺緞瑙勫垝 - 鍑瑰杈瑰舰鍏煎浼樺寲鐗� V5.0
  * 淇锛氳В鍐冲嚬澶氳竟褰㈡壂鎻忕嚎璺ㄨ秺杈圭晫鐨勯棶棰橈紝浼樺寲璺緞瀵归綈
  */
 public class YixinglujingNoObstacle {
+    // 寮�鍏筹細鏄惁寮哄埗鎵�鏈夐潪浣滀笟杩炴帴娌垮畨鍏ㄨ竟鐣岃璧帮紙閬垮厤浠讳綍鍐呭尯鐩寸嚎璺ㄨ秺锛�
+    // 鏀逛负鍙姩鎬佽缃紝鑷姩渚濇嵁鍦板潡褰㈢姸鍚敤
+    private static boolean FORCE_BOUNDARY_TRAVEL = true;
     // 鐢ㄦ硶璇存槑锛堟棤闅滅鐗╄矾寰勮鍒掞級锛�
     // - 鏂规硶鐢ㄩ�旓細鏍规嵁鍦板潡杈圭晫銆佸壊鑽夊搴︿笌瀹夊叏杈硅窛锛岀敓鎴愯鐩栧叏鍖哄煙鐨勫壊鑽夎矾寰勩��
     // - 鍙傛暟锛�
@@ -39,6 +40,9 @@
 
         // 3. 纭畾鏈�浼樹綔涓氳搴�
         double bestAngle = findOptimalAngle(boundary);
+
+        // 3.1 鑷姩鍒ゆ柇鏄惁闇�瑕佸己鍒舵部杈圭晫鏃呰锛堟娴嬪嚬閮�/澶氭鎵弿琛岋級
+        FORCE_BOUNDARY_TRAVEL = shouldForceBoundaryTravel(boundary, mowWidth, bestAngle);
         
         // 4. 鑾峰彇棣栦釜浣滀笟鐐癸紝鐢ㄤ簬瀵归綈鍥磋竟璧风偣
         Point firstScanStart = getFirstScanPoint(boundary, mowWidth, bestAngle);
@@ -61,7 +65,10 @@
         
         finalPath.addAll(scanPath);
 
-        // 8. 鏍煎紡鍖栧潗鏍囷細淇濈暀涓や綅灏忔暟
+        // 8. 鏈�缁堝畨鍏ㄥ噣鍖栵細纭繚鎵�鏈夋鍦ㄥ唴缂╄竟鐣屼笂鎴栧唴閮紙鑷姩璐磋竟闃堝�硷級
+        sanitizePath(finalPath, boundary, mowWidth, safeMargin);
+
+        // 9. 鏍煎紡鍖栧潗鏍囷細淇濈暀涓や綅灏忔暟
         for (PathSegment segment : finalPath) {
             segment.start.x = Math.round(segment.start.x * 100.0) / 100.0;
             segment.start.y = Math.round(segment.start.y * 100.0) / 100.0;
@@ -72,7 +79,123 @@
         return finalPath;
     }
 
+    // 瀵规墍鏈夎矾寰勬杩涜瀹夊叏鍑�鍖栵細
+    // - 闈炰綔涓氭锛氱粺涓�娌胯竟鐣岃矾寰勬浛鎹�
+    // - 浣滀笟娈碉細鑻ョ鐐瑰湪澶栨垨娈典笌杈圭晫鐩镐氦锛屽惛闄勭鐐瑰埌杈圭晫骞跺悜鍐呬晶鍋忕Щ epsilon
+    private static void sanitizePath(List<PathSegment> segments, List<Point> polygon, double width, double margin) {
+        double epsilon = computeAutoInnerOffset(polygon, width, margin);
+        List<PathSegment> sanitized = new ArrayList<>();
+        for (PathSegment s : segments) {
+            boolean startInside = isPointInPolygon(s.start, polygon);
+            boolean endInside = isPointInPolygon(s.end, polygon);
+            boolean intersects = segmentIntersectsBoundary(s.start, s.end, polygon);
+            if (!s.isMowing) {
+                // 闈炰綔涓氭缁熶竴鏇挎崲涓烘部杈圭晫璺緞
+                List<Point> path = getBoundaryPathWithSnap(s.start, s.end, polygon);
+                for (int i = 0; i < path.size() - 1; i++) {
+                    sanitized.add(new PathSegment(path.get(i), path.get(i+1), false));
+                }
+            } else {
+                if (!startInside || !endInside || intersects) {
+                    SnapResult s1 = snapToBoundary(s.start, polygon);
+                    SnapResult s2 = snapToBoundary(s.end, polygon);
+                    Point p1 = pushInsideOnEdge(s1, polygon, epsilon);
+                    Point p2 = pushInsideOnEdge(s2, polygon, epsilon);
+                    sanitized.add(new PathSegment(p1, p2, true));
+                } else {
+                    sanitized.add(s);
+                }
+            }
+        }
+        segments.clear();
+        segments.addAll(sanitized);
+    }
+
+    private static boolean segmentIntersectsBoundary(Point a, Point b, List<Point> polygon) {
+        for (int i = 0; i < polygon.size(); i++) {
+            Point c = polygon.get(i);
+            Point d = polygon.get((i + 1) % polygon.size());
+            // 蹇界暐鍏变韩绔偣鐨勭浉浜�
+            if (isSamePoint(a, c) || isSamePoint(a, d) || isSamePoint(b, c) || isSamePoint(b, d)) continue;
+            if (segmentsIntersect(a, b, c, d)) return true;
+        }
+        return false;
+    }
+
+    // 灏嗚竟鐣屼笂鐨勬姇褰辩偣鍚戝唴渚у亸绉� epsilon
+    private static Point pushInsideOnEdge(SnapResult sr, List<Point> poly, double epsilon) {
+        int i = sr.edgeIndex;
+        Point s = poly.get(i);
+        Point e = poly.get((i + 1) % poly.size());
+        double dx = e.x - s.x, dy = e.y - s.y;
+        double len = Math.hypot(dx, dy);
+        if (len < 1e-6) return sr.onEdge;
+        // 瀵逛簬閫嗘椂閽堬紙CCW锛夊杈瑰舰锛屽乏杞硶鍚戦噺 (-dy, dx) 鎸囧悜鍐呬晶
+        double nx = -dy / len, ny = dx / len;
+        return new Point(sr.onEdge.x + nx * epsilon, sr.onEdge.y + ny * epsilon);
+    }
+
+    // 鑷姩璁$畻璐磋竟鍐呭亸绉婚槇鍊� epsilon锛氭牴鎹湴鍧楀昂搴︺�佹渶鐭竟銆佸壊鑽夊搴︿笌瀹夊叏杈硅窛缁煎悎浼扮畻
+    private static double computeAutoInnerOffset(List<Point> polygon, double width, double margin) {
+        double minEdge = Double.MAX_VALUE;
+        double minX = Double.MAX_VALUE, minY = Double.MAX_VALUE;
+        double maxX = -Double.MAX_VALUE, maxY = -Double.MAX_VALUE;
+        for (int i = 0; i < polygon.size(); i++) {
+            Point a = polygon.get(i);
+            Point b = polygon.get((i + 1) % polygon.size());
+            minEdge = Math.min(minEdge, Math.hypot(a.x - b.x, a.y - b.y));
+            minX = Math.min(minX, a.x); minY = Math.min(minY, a.y);
+            maxX = Math.max(maxX, a.x); maxY = Math.max(maxY, a.y);
+        }
+        double diag = Math.hypot(maxX - minX, maxY - minY);
+        // 鍩虹閲忥細鏁板�肩ǔ瀹氶渶瑕佺殑鏈�灏忓唴鍋忕Щ锛堝彇鍓插箙鐨�1%涓庡瑙掔嚎鐨�0.2%涔嬮棿鐨勮緝澶у�硷級
+        double base = Math.max(width * 0.01, diag * 0.002);
+        // 涓婇檺锛氫笉瓒呰繃瀹夊叏杈硅窛鐨�20%涓庡壊骞呯殑10%
+        double upper = Math.min(margin * 0.2, width * 0.1);
+        // 鍙楄竟闀跨害鏉燂細涓嶈秴杩囨渶鐭竟鐨�2%
+        double edgeLimit = minEdge * 0.02;
+        double eps = Math.min(upper, Math.max(base, edgeLimit * 0.5));
+        // 涓嬮檺/涓婇檺鏈�缁堥挸浣嶏細3mm 鍒� 5cm
+        eps = Math.max(0.003, Math.min(eps, 0.05));
+        return eps;
+    }
+
+    // 鏍规嵁鎵弿琛岀殑浜ょ偣鏁伴噺鏉ュ垽鏂槸鍚﹀瓨鍦ㄢ�滃娈佃鈥濓紙>=2娈碉級锛屾湁鍑归儴鎴栫獎閫氶亾鏃跺惎鐢ㄥ己鍒舵部杈圭晫鏃呰
+    private static boolean shouldForceBoundaryTravel(List<Point> polygon, double width, double angle) {
+        List<Point> rotatedPoly = new ArrayList<>();
+        for (Point p : polygon) rotatedPoly.add(rotatePoint(p, -angle));
+        double minY = Double.MAX_VALUE, maxY = -Double.MAX_VALUE;
+        for (Point p : rotatedPoly) { minY = Math.min(minY, p.y); maxY = Math.max(maxY, p.y); }
+
+        int multiSegmentRows = 0;
+        int totalRows = 0;
+        for (double y = minY + width/2; y <= maxY - width/2; y += width) {
+            List<Double> xIntersections = getXIntersections(rotatedPoly, y);
+            if (xIntersections.size() < 2) continue;
+            totalRows++;
+            if (xIntersections.size() >= 4) multiSegmentRows++; // 鍚屼竴琛屽嚭鐜颁袱涓強浠ヤ笂浣滀笟娈�
+        }
+        // 鍙鍑虹幇杩団�滃娈佃鈥濓紝灏卞己鍒舵部杈圭晫鏃呰锛涗篃鍙寜姣斾緥闃堝�艰Е鍙戯紙渚嬪 >=10%锛�
+        if (multiSegmentRows > 0) return true;
+        double ratio = totalRows == 0 ? 0.0 : (double) multiSegmentRows / (double) totalRows;
+        return ratio >= 0.1; // 鍏滃簳闃堝��
+    }
+
     private static List<PathSegment> generateGlobalScanPath(List<Point> polygon, double width, double angle, Point currentPos) {
+        // 鍏堝皾璇曞皢鍑归櫡澶勮涓轰袱涓嫭绔嬪尯鍩燂紝鍒嗕袱娆℃壂鎻忥紝閬垮厤璺ㄥ尯鐩寸嚎杩炴帴
+        List<PathSegment> all = new ArrayList<>();
+        // 绗竴娆℃壂鎻忥細浼樺厛澶勭悊宸︿晶鍖哄煙锛坓roupIndex=0锛�
+        List<PathSegment> leftScan = generateScanPathForSide(polygon, width, angle, currentPos, 0);
+        all.addAll(leftScan);
+        Point posAfterLeft = leftScan.isEmpty() ? currentPos : leftScan.get(leftScan.size() - 1).end;
+        // 绗簩娆℃壂鎻忥細澶勭悊鍙充晶鍖哄煙锛坓roupIndex=1锛夛紝浠庡乏渚х粨鏉熺偣娌胯竟鐣屽埌鍙充晶棣栨
+        List<PathSegment> rightScan = generateScanPathForSide(polygon, width, angle, posAfterLeft, 1);
+        all.addAll(rightScan);
+        return all;
+    }
+
+    // 浠呮壂鎻忔寚瀹氫晶锛堝悓涓�鏉℃壂鎻忕嚎鐨勭 groupIndex 娈碉級锛岀敤浜庡皢鈥滆�虫湹鈥濊涓虹嫭绔嬪尯鍩�
+    private static List<PathSegment> generateScanPathForSide(List<Point> polygon, double width, double angle, Point currentPos, int sideIndex) {
         List<PathSegment> segments = new ArrayList<>();
         List<Point> rotatedPoly = new ArrayList<>();
         for (Point p : polygon) rotatedPoly.add(rotatePoint(p, -angle));
@@ -84,37 +207,46 @@
         }
 
         boolean leftToRight = true;
-        // 姝ラ暱 y 浠庢渶灏忓埌鏈�澶ф壂鎻�
+        boolean firstSegmentConnected = false;
+
         for (double y = minY + width/2; y <= maxY - width/2; y += width) {
             List<Double> xIntersections = getXIntersections(rotatedPoly, y);
             if (xIntersections.size() < 2) continue;
             Collections.sort(xIntersections);
 
-            // 澶勭悊鍑瑰杈瑰舰锛氭瘡涓や釜鐐圭粍鎴愪竴涓湁鏁堜綔涓氭
+            // 鏋勫缓鏈鐨勪綔涓氭锛堝乏鍒板彸锛夊拰缁勭储寮�
             List<PathSegment> lineSegmentsInRow = new ArrayList<>();
-            for (int i = 0; i < xIntersections.size() - 1; i += 2) {
+            List<Integer> groupIndices = new ArrayList<>();
+            for (int i = 0, g = 0; i < xIntersections.size() - 1; i += 2, g++) {
                 Point pS = rotatePoint(new Point(xIntersections.get(i), y), angle);
                 Point pE = rotatePoint(new Point(xIntersections.get(i + 1), y), angle);
                 lineSegmentsInRow.add(new PathSegment(pS, pE, true));
+                groupIndices.add(g);
             }
 
-            // 鏍规嵁褰撳墠S鍨嬫柟鍚戞帓搴忎綔涓氭
             if (!leftToRight) {
                 Collections.reverse(lineSegmentsInRow);
+                Collections.reverse(groupIndices);
                 for (PathSegment s : lineSegmentsInRow) {
                     Point temp = s.start; s.start = s.end; s.end = temp;
                 }
             }
 
-            // 灏嗕綔涓氭杩炴帴鍒版�昏矾寰�
-            for (PathSegment s : lineSegmentsInRow) {
-                if (Math.hypot(currentPos.x - s.start.x, currentPos.y - s.start.y) > 0.01) {
-                    // 濡傛灉闂磋窛澶т簬1cm锛屾坊鍔犵┖璧拌矾寰�
-                    addSafeConnection(segments, currentPos, s.start, polygon);
-                }
-                segments.add(s);
-                currentPos = s.end;
+            int idxInRow = groupIndices.indexOf(sideIndex);
+            if (idxInRow == -1) {
+                // 鏈涓嶅寘鍚渚х殑浣滀笟娈碉紝璺宠繃
+                leftToRight = !leftToRight;
+                continue;
             }
+
+            PathSegment s = lineSegmentsInRow.get(idxInRow);
+            // 棣栨杩炴帴鎴栬法鍖鸿繛鎺ュ潎寮哄埗娌胯竟鐣岋紝閬垮厤绌胯秺鍑归櫡鍖�
+            if (Math.hypot(currentPos.x - s.start.x, currentPos.y - s.start.y) > 0.01) {
+                addBoundaryConnection(segments, currentPos, s.start, polygon);
+                firstSegmentConnected = true;
+            }
+            segments.add(s);
+            currentPos = s.end;
             leftToRight = !leftToRight;
         }
         return segments;
@@ -237,14 +369,84 @@
     }
 
     private static void addSafeConnection(List<PathSegment> segments, Point start, Point end, List<Point> polygon) {
-        if (isSegmentSafe(start, end, polygon)) {
+        if (!FORCE_BOUNDARY_TRAVEL && isSegmentSafe(start, end, polygon)) {
             segments.add(new PathSegment(start, end, false));
-        } else {
-            List<Point> path = getBoundaryPath(start, end, polygon);
-            for (int i = 0; i < path.size() - 1; i++) {
-                segments.add(new PathSegment(path.get(i), path.get(i+1), false));
-            }
+            return;
         }
+        List<Point> path = getBoundaryPathWithSnap(start, end, polygon);
+        for (int i = 0; i < path.size() - 1; i++) {
+            segments.add(new PathSegment(path.get(i), path.get(i+1), false));
+        }
+    }
+
+    // 寮哄埗娌胯竟鐣岀粫琛岀殑杩炴帴锛堜笉鍋氱洿绾垮畨鍏ㄥ垽鏂級锛岀敤鏉ュ湪鍚屼竴鎵弿琛岀殑澶氫釜浣滀笟娈典箣闂磋烦杞�
+    private static void addBoundaryConnection(List<PathSegment> segments, Point start, Point end, List<Point> polygon) {
+        List<Point> path = getBoundaryPathWithSnap(start, end, polygon);
+        for (int i = 0; i < path.size() - 1; i++) {
+            segments.add(new PathSegment(path.get(i), path.get(i+1), false));
+        }
+    }
+
+    // 灏嗕换鎰忎袱鐐归�氳繃鈥滃惛闄勫埌杈圭晫鈥濆悗娌胯竟鐣屾渶鐭矾寰勮繛鎺�
+    private static List<Point> getBoundaryPathWithSnap(Point start, Point end, List<Point> polygon) {
+        SnapResult s1 = snapToBoundary(start, polygon);
+        SnapResult s2 = snapToBoundary(end, polygon);
+        int n = polygon.size();
+
+        // 鍓嶅悜璺緞锛堥『杈癸級
+        List<Point> pathFwd = new ArrayList<>();
+        pathFwd.add(start);
+        pathFwd.add(s1.onEdge);
+        int curr = s1.edgeIndex;
+        while (curr != s2.edgeIndex) {
+            pathFwd.add(polygon.get((curr + 1) % n));
+            curr = (curr + 1) % n;
+        }
+        pathFwd.add(s2.onEdge);
+        pathFwd.add(end);
+
+        // 鍙嶅悜璺緞锛堥�嗚竟锛�
+        List<Point> pathRev = new ArrayList<>();
+        pathRev.add(start);
+        pathRev.add(s1.onEdge);
+        curr = s1.edgeIndex;
+        while (curr != s2.edgeIndex) {
+            pathRev.add(polygon.get(curr));
+            curr = (curr - 1 + n) % n;
+        }
+        pathRev.add(s2.onEdge);
+        pathRev.add(end);
+
+        return getPathLength(pathFwd) < getPathLength(pathRev) ? pathFwd : pathRev;
+    }
+
+    private static class SnapResult {
+        Point onEdge;
+        int edgeIndex;
+        SnapResult(Point p, int idx) { this.onEdge = p; this.edgeIndex = idx; }
+    }
+
+    // 璁$畻鐐瑰埌杈圭晫鏈�杩戠殑鎶曞奖鐐逛互鍙婃墍鍦ㄨ竟绱㈠紩
+    private static SnapResult snapToBoundary(Point p, List<Point> poly) {
+        double minD = Double.MAX_VALUE;
+        Point bestProj = p;
+        int bestIdx = -1;
+        for (int i = 0; i < poly.size(); i++) {
+            Point s = poly.get(i);
+            Point e = poly.get((i + 1) % poly.size());
+            double l2 = (s.x - e.x)*(s.x - e.x) + (s.y - e.y)*(s.y - e.y);
+            if (l2 == 0) {
+                double d = Math.hypot(p.x - s.x, p.y - s.y);
+                if (d < minD) { minD = d; bestProj = s; bestIdx = i; }
+                continue;
+            }
+            double t = ((p.x - s.x) * (e.x - s.x) + (p.y - s.y) * (e.y - s.y)) / l2;
+            t = Math.max(0, Math.min(1, t));
+            Point proj = new Point(s.x + t * (e.x - s.x), s.y + t * (e.y - s.y));
+            double d = Math.hypot(p.x - proj.x, p.y - proj.y);
+            if (d < minD) { minD = d; bestProj = proj; bestIdx = i; }
+        }
+        return new SnapResult(bestProj, bestIdx == -1 ? 0 : bestIdx);
     }
 
     private static boolean isSegmentSafe(Point p1, Point p2, List<Point> polygon) {
@@ -322,12 +524,21 @@
     }
 
     private static int getEdgeIndex(Point p, List<Point> poly) {
+        int bestIdx = -1;
+        double minD = Double.MAX_VALUE;
         for (int i = 0; i < poly.size(); i++) {
             Point p1 = poly.get(i);
             Point p2 = poly.get((i + 1) % poly.size());
-            if (distToSegment(p, p1, p2) < 1e-3) return i;
+            double d = distToSegment(p, p1, p2);
+            if (d < minD) {
+                minD = d;
+                bestIdx = i;
+            }
         }
-        return -1;
+        // 鍙鎵惧埌鏈�杩戠殑杈瑰嵆鍙紝鏀惧闃堝�间互搴斿娴偣璇樊鍜屾棆杞彉褰�
+        // 濡傛灉璺濈杩囧ぇ锛堜緥濡傝秴杩�1绫筹級锛屽彲鑳界‘瀹炰笉鍦ㄨ竟鐣屼笂锛屼絾鍦ㄨ矾寰勮鍒掍笂涓嬫枃涓紝
+        // 杩欎簺鐐规槸鐢辨壂鎻忕嚎鐢熸垚鐨勶紝鐞嗚涓婁竴瀹氬湪杈圭晫涓婏紝鎵�浠ュ己鍒跺惛闄勬槸瀹夊叏鐨勩��
+        return minD < 1.0 ? bestIdx : -1;
     }
     
     private static double distToSegment(Point p, Point s, Point e) {

--
Gitblit v1.10.0