HiNC-Deploy/Demo-Para-Training-S50C-202501
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: reconcile the dt-side project state with Gitea

Browse Source 
Both sides had edited the same project files from a common base. Conflicts
are resolved in favour of dt's copy: it carries the newer schema
(the app migrates .hincproj on load and writes it back) and it is what the
running HiNC-1 services actually use. Gitea's side of each conflicted file
stays reachable in history, and every file TC added that did not collide is
taken as-is.
  Output/S50C-fine.mp: TC deleted it, dt still had edits -- dt's file kept

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
iamboss
2026-08-07 15:38:50 +08:00
co-authored by Claude Opus 5
parent fe55e87597 cabbec9833
commit fa61b6c4db
9 changed files with 872 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Output/S50C-2-fine-0.1.mp
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara2d>
<Name>S50C-2-fine-0.1.mp</Name>
<Note>SampleFlags = Fx, Fy, Fz; Correlation Coefficient R = 59.77%; FilteredSampleNum = 815940</Note>
<Ksc>587.1227668411768</Ksc>
<Ksn>-1464.4015004965706</Ksn>
<Kpc>25.582925097663253</Kpc>
<Kpn>-3.5401116760199125</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara2d>
Output/S50C-2.mp
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara>
<Name>S50C-2.mp</Name>
<Note />
<Kse>721.4480844419355</Kse>
<Ksc>488.18658146979453</Ksc>
<Ksn>-1237.9229395005204</Ksn>
<Kpe>13.037775671993957</Kpe>
<Kpc>19.715961218949563</Kpc>
<Kpn>-21.762521868517958</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara>
Output/S50C-2d.mp
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara2d>
<Name>S50C-2d.mp</Name>
<Note>SampleFlags = Fx, Fy, Fz; Correlation Coefficient R = 57.79%; FilteredSampleNum = 725220</Note>
<Ksc>776.7735765695861</Ksc>
<Ksn>-1701.0286467145884</Ksn>
<Kpc>8.185515874589065</Kpc>
<Kpn>20.118736350399548</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara2d>
Output/S50C-outlier-0.1.mp
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara>
<Name>S50C-outlier-0.1.mp</Name>
<Note />
<Kse>742.950584437656</Kse>
<Ksc>490.8517248037793</Ksc>
<Ksn>-1283.4354748025762</Ksn>
<Kpe>11.6974327170165</Kpe>
<Kpc>19.66896167423929</Kpc>
<Kpn>-19.835968644919518</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara>
Output/S50C-outlier-0.2.mp
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara>
<Name>S50C-outlier-0.2.mp</Name>
<Note />
<Kse>758.6010210824404</Kse>
<Ksc>516.1247909594373</Ksc>
<Ksn>-1302.95910060132</Ksn>
<Kpe>12.15402056324717</Kpe>
<Kpc>19.20207770135865</Kpc>
<Kpn>-20.234413210618193</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara>
Output/S50C-outlier-0.5.mp
-12
View File
@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara>
<Name>S50C-outlier-0.5.mp</Name>
<Note />
<Kse>751.3642344760983</Kse>
<Ksc>512.438657994816</Ksc>
<Ksn>-1290.9761068535777</Ksn>
<Kpe>12.29573220360363</Kpe>
<Kpc>19.020893816232572</Kpc>
<Kpn>-20.450088354259567</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara>
Output/S50C.mp
+11 -11
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara>
<Name>S50C</Name>
<Note>S50C-fine-outlier-0.2. Built on 2025-01-17.</Note>
<Kse>781.9193047583416</Kse>
<Ksc>534.2515063930691</Ksc>
<Ksn>-1341.4299667097694</Ksn>
<Kpe>12.488024348568263</Kpe>
<Kpc>19.81313632613896</Kpc>
<Kpn>-20.852754261520523</Kpn>
<?xml version="1.0" encoding="utf-8"?>
<RakeFaceCuttingPara3d>
<Name>S50C.mp</Name>
<Note>SampleFlags = Fx, Fy, Fz; Correlation Coefficient R = 97.18%; FilteredSampleNum = 815940</Note>
<Kse>804.9791868832534</Kse>
<Ksc>615.7074172303907</Ksc>
<Ksn>-1351.984666781255</Ksn>
<Kpe>12.759415000308216</Kpe>
<Kpc>21.565605681453548</Kpc>
<Kpn>-20.259194685261928</Kpn>
<AnchorRakeAngle_deg>8</AnchorRakeAngle_deg>
</RakeFaceCuttingPara>
</RakeFaceCuttingPara3d>