pakoo

Author: Duo-Star

lib/MathForest/Algebra/Trunk/Fertile/DNum.dart

@@ -1,5 +1,5 @@
 //
-import 'dart:math';
+import 'dart:math' as math;
 
 /*
 
@@ -13,6 +13,9 @@ class DNum {
         n1 = n1 ?? -1,
         n2 = n2 ?? 1;
 
+  num get min => math.min(n1, n2);
+  num get max => math.max(n1, n2);
+
 @override
   String toString() {
     return 'DNum(${n1.toString()}, ${n2.toString()})';

lib/MathForest/Geometry/D2/Conic/Circle.dart

@@ -1,6 +1,7 @@
 //
 
 import 'dart:math';
+import '../../../Algebra/Functions/Main.dart' as funcs;
 //
 import '../../../Algebra/Trunk/Fertile/DNum.dart';
 import '../../../Algebra/Trunk/Fertile/QNum.dart';
@@ -37,6 +38,10 @@ class Circle {
     indexPoint(theta.n4),
   );
 
+  num disP(Vector p0){
+    return funcs.abs((p0 - p).len - r);
+  }
+
   @override
   String toString() {
     return "Cir2(${p.toString()} , $r})";

lib/MathForest/Geometry/D2/Conic/Conic0.dart

@@ -143,20 +143,61 @@ class Conic0 {
   }
 
   //
-  num thetaClosestP2P(Vector P){
-    num t0 ;
-    if (u.len>=v.len) {
-      if ((P-p).dot(v)>0 ){ t0=pi/2; }else{ t0=-pi/2; }
-    } else {
-      if ((P-p).dot(u)>0) { t0=0; }else{ t0=pi; }
+  num thetaClosestP2P(Vector P, {double tolerance = 1e-8, int maxIterations = 50}) {
+    // 局部优化函数
+    num optimizeFrom(num t0) {
+      num t = t0;
+      num k = -0.5; // 初始学习率
+      num prevDistance = double.infinity;
+
+      for (var i = 0; i < maxIterations; i++) {
+        // 计算梯度（距离平方的导数）
+        num gradient = derDisP2P(P, t);
+
+        // 收敛检测
+        if (gradient.abs() < tolerance) break;
+
+        // 更新参数
+        t += k * gradient;
+
+        // 规范化角度到 [0, 2π)
+        t = t % (2 * pi);
+        if (t < 0) t += 2 * pi;
+
+        // 计算当前距离
+        num currentDistance = disP2P(P, t);
+
+        // 检查距离变化
+        if ((prevDistance - currentDistance).abs() < tolerance) break;
+        prevDistance = currentDistance;
+
+        // 衰减学习率
+        k *= 0.85; // 每次衰减15%
+      }
+      return t;
+    }
+
+    // 初始点：覆盖一个周期 [0, 2π)
+    List<num> initialThetas = [];
+    for (int i = 0; i < 12; i++) {
+      initialThetas.add(i * pi / 6); // 每30°一个点
     }
-    num t=t0;
-    num k=-0.05;
-    for (var i = 0; i < 12; i++) {
-      t = t + k * derDisP2P(P,t);
-      k=k/exp(0.0618*i);
+
+    // 优化每个初始点并找到最佳结果
+    num bestTheta = initialThetas[0];
+    num minDistance = double.infinity;
+
+    for (num t0 in initialThetas) {
+      num theta = optimizeFrom(t0);
+      num distance = disP2P(P, theta);
+
+      if (distance < minDistance) {
+        minDistance = distance;
+        bestTheta = theta;
+      }
     }
-    return t;
+
+    return bestTheta;
   }
 
   Vector pClosestP2P(Vector P){
@@ -167,6 +208,10 @@ class Conic0 {
     return P.dis(pClosestP2P(P));
   }
 
+  num disP(Vector P){
+    return disClosestP2P(P);
+  }
+
 
 
   //Conic get conic => Conic().byConic0(this);

lib/MathForest/Geometry/D2/Fertile/DPoint.dart

@@ -1,6 +1,7 @@
 // 平面骈点
 import '../Linear/Line.dart';
 import '../Linear/Vector.dart';
+import '../../../Algebra/Trunk/Fertile/DNum.dart';
 
 /*
 共生双点，没有区分方法和必要
@@ -26,6 +27,10 @@ class DPoint {
 
   Line get l => Line.new2P(p1, p2);
 
+  DNum disP(Vector p0){
+    return DNum(p0.dis(p1), p0.dis(p2));
+  }
+
   static DPoint zero = DPoint(Vector.zero, Vector.zero);
   static DPoint inf = DPoint(Vector.inf, Vector.inf);
   static DPoint nan = DPoint(Vector.nan, Vector.nan);

lib/MathForest/Geometry/D2/GMK/Core/GMKCompiler.dart

@@ -8,7 +8,7 @@ import '../Monxiv/GOBJStyle.dart' as gStyle;
 
 import 'GMKCommand.dart';
 import 'GMKStructure.dart';
-import 'GMKError.dart';
+import 'GMKLib.dart' as g_lib;
 
 import '../../Linear/Vector.dart';
 import '../../Conic/Circle.dart';
@@ -157,14 +157,21 @@ GMKStructure goCompiler(String source) {
         String label = subStringBetween(line, '@', ' is ').trim();
         String method = subStringBetween(line, ' is ', ' of ').trim();
         List<dynamic> factor = str2Factor(extractAfter(line, ' of '));
-        structure.addStep(GMKCommand(method, label, factor));
+        //
+        GMKCommand cmd = GMKCommand(method, label, factor);
+        cmd.type = g_lib.method2type[method] ?? '?unType';
+        gStyle.GOBJStyle style = gStyle.GOBJStyle.apply(cmd.type);
+        cmd.style = style;
+        structure.addStep(cmd);
       }  catch (e, stackTrace) {
         Exception('错误: $e');
         Exception('堆栈跟踪: $stackTrace');
       }
     } else if (line.startsWith('#')) {
-      gStyle.GOBJStyle style = styleCompiler(line);
       String label = subStringBetween(line, '#', ' ').trim();
+      gStyle.GOBJStyle? oldStyle = structure.step[label]?.style;
+      gStyle.GOBJStyle style = styleCompiler(oldStyle!, line);
+
       structure.step[label]?.style = style;
       if (kDebugMode) {
         print('set style<$label>:${style.toString()}');
@@ -241,20 +248,26 @@ String gmkCommand2Str(GMKCommand gc) {
 }
 
 
-gStyle.GOBJStyle styleCompiler(String sCode) {
-  gStyle.GOBJStyle result = gStyle.GOBJStyle.none();
+gStyle.GOBJStyle styleCompiler(gStyle.GOBJStyle oldStyle, String sCode) {
+  gStyle.GOBJStyle result = oldStyle;
   String label = subStringBetween(sCode, '#', ' ').trim();
   String sFactor = extractAfter(sCode, '#$label');
   List<dynamic> factor = str2Factor(sFactor);
   for (int i = 0; i < factor.length; i++) {
     dynamic itemFactor = factor[i];
-    print(itemFactor.runtimeType);
+    //print(itemFactor.runtimeType);
     if (gStyle.color.contains(itemFactor)) {
       result.color = gStyle.colors[itemFactor]!;
     } else if (gStyle.shape.contains(itemFactor)) {
       result.shape = itemFactor;
     } else if (itemFactor.runtimeType == double || itemFactor.runtimeType == int) {
       result.size = itemFactor;
+    }  else if (gStyle.show.contains(itemFactor)) {
+      result.show = (itemFactor == 'show');
+    } else if (gStyle.labelShow.contains(itemFactor)) {
+      result.labelShow = (itemFactor == 'labelShow');
+    } else if (gStyle.fertileWaveLink.contains(itemFactor)) {
+      result.fertileWaveLink = (itemFactor == 'fertileWaveLink');
     }
   }
   return result;

lib/MathForest/Geometry/D2/GMK/Core/GMKCore.dart

@@ -63,7 +63,8 @@ class GMKCore {
       String label = itemCommand.label;
       gStyle.GOBJStyle style = itemCommand.style;
       var (obj, type) = lib.analysis(itemCommand, gmkData);
-      itemCommand.type = type;
+      //itemCommand.type = type;
+      // 改为编译时生成type
       if (obj == null) {
         if (type == 'e-findMethod:none') {
           Exception(