Merge commit 'fa565040b8234085ede5dce8ea33cd1510435c54'

埃博拉酱 · 埃博拉酱 · commit 423e608aebb5 · 2025-06-23T11:59:59.000+08:00
#Conflicts:
#	Contents.m
diff --git a/+MATLAB/+DataTypes/VarFun.mlx b/+MATLAB/+DataTypes/VarFun.mlx
diff --git a/+MATLAB/+ElMat/Find.mlx b/+MATLAB/+ElMat/Find.mlx
diff --git a/+MATLAB/+Graphics/OptimizedLegendLocation.mlx b/+MATLAB/+Graphics/OptimizedLegendLocation.mlx
diff --git a/+MATLAB/+Graphics/UnifyAxesLims.mlx b/+MATLAB/+Graphics/UnifyAxesLims.mlx
diff --git a/Contents.m b/Contents.m
@@ -1,2 +1,6 @@
 % 埃博拉酱的MATLAB扩展
-% Version 19.7.0 (R2024b) 26-Apr-2025
+<<<<<<< HEAD
+% Version 19.7.0 (R2024b) 26-Apr-2025
+=======
+% Version 19.7.0 (R2025a) 22-May-2025
+>>>>>>> fa565040b8234085ede5dce8ea33cd1510435c54
diff --git a/README.md b/README.md
@@ -184,6 +184,9 @@ function Bytes = Serialize(Data,Dimensions)
 
 %内置typecast的升级版，支持多维数组，需指定转换维度
 function Y = TypeCast(X,Type,Dimension)
+
+%内置varfun的魔改版，支持多个输入输出
+function varargout = VarFun(Function,varargin)
 ```
 ## +ElFun
 ```MATLAB
@@ -198,6 +201,9 @@ function Allocation = IntegerAllocate(Resources,Weights)
 %内置cat函数的魔改版，可以给不兼容数组自动剪除尾数
 function Array = CutCat(Dimension,varargin)
 
+%内置find的魔改版，支持在多维数组上的任意维度查找非零值所在的位置，在其它维度上独立执行。
+function [Index,NonZeros] = Find(Array,NumToFind,Dimensions,Last)
+
 %内置flip函数的升级版，支持同时翻转多个维度
 function A = Flip(A,Dimensions)
 
@@ -282,8 +288,11 @@ function Patches=MultiShadowedLines(Y,ShadowHeights,FaceAlpha,options)
 %创建带有可自定义文本的嵌套饼状图
 function fig = NestedPie(C, options)
 
+%根据输入的图形对象，返回一个尽可能不遮挡图形的图例位置
+function Location=OptimizedLegendLocation(GObjects)
+
 %统一各坐标区的XYZC轴范围
-function UnifyAxesLims(Axes,varargin)
+function varargout=UnifyAxesLims(Axes,varargin)
 
 %列出内置作图函数允许使用的Marker字符
 function VMC = ValidMarkerChars(Index)
diff --git a/resources/functionSignatures.json b/resources/functionSignatures.json
@@ -1503,6 +1503,21 @@
 			}
 		]
 	},
+	"MATLAB.DataTypes.VarFun": {
+		"inputs": [
+			{
+				"name": "Function",
+				"kind": "required",
+				"purpose": "可调用对象"
+			},
+			{
+				"name": "InTable",
+				"kind": "required",
+				"repeating": true,
+				"purpose": "包含输入参数的表"
+			}
+		]
+	},
 	"MATLAB.ElFun.AngleND": {
 		"inputs": [
 			{
@@ -1595,6 +1610,39 @@
 			}
 		]
 	},
+	"MATLAB.ElMat.Find": {
+		"inputs": [
+			{
+				"name": "Array",
+				"kind": "required",
+				"purpose": "任意维度数组"
+			},
+			{
+				"name": "NumToFind",
+				"kind": "required",
+				"type": "positive",
+				"purpose": "最多要找出的个数"
+			},
+			{
+				"name": "Dimensions",
+				"kind": "required",
+				"type": [
+					"real",
+					"vector"
+				],
+				"purpose": "要查找的维度"
+			},
+			{
+				"name": "Last",
+				"kind": "ordered",
+				"type": [
+					"logical",
+					"scalar"
+				],
+				"purpose": "是否从后向前查找"
+			}
+		]
+	},
 	"MATLAB.ElMat.Flip": {
 		"inputs": [
 			{
@@ -2709,6 +2757,15 @@
 			}
 		]
 	},
+	"MATLAB.Graphics.OptimizedLegendLocation": {
+		"inputs": [
+			{
+				"name": "GObjects",
+				"kind": "required",
+				"purpose": "作图函数返回的图形对象"
+			}
+		]
+	},
 	"MATLAB.Graphics.UnifyAxesLims": {
 		"inputs": [
 			{
diff --git a/resources/project/Dh39fyjyPvwuEWUj-9Uph7KUAhg/zaRbakiyZxzXuww70HE4a4rn19Qd.xml b/resources/project/Dh39fyjyPvwuEWUj-9Uph7KUAhg/zaRbakiyZxzXuww70HE4a4rn19Qd.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/Dh39fyjyPvwuEWUj-9Uph7KUAhg/zaRbakiyZxzXuww70HE4a4rn19Qp.xml b/resources/project/Dh39fyjyPvwuEWUj-9Uph7KUAhg/zaRbakiyZxzXuww70HE4a4rn19Qp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="Find.mlx" type="File"/>
diff --git a/resources/project/mY4dRer9ygLPYSPCTGLuplLE_3Q/pO-xsN0iAJcC-541ZqtKatPJnFUd.xml b/resources/project/mY4dRer9ygLPYSPCTGLuplLE_3Q/pO-xsN0iAJcC-541ZqtKatPJnFUd.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/mY4dRer9ygLPYSPCTGLuplLE_3Q/pO-xsN0iAJcC-541ZqtKatPJnFUp.xml b/resources/project/mY4dRer9ygLPYSPCTGLuplLE_3Q/pO-xsN0iAJcC-541ZqtKatPJnFUp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="OptimizedLegendLocation.mlx" type="File"/>
diff --git a/resources/project/z1zMm7A1B3CIys2olxhHmFtBIcI/ZexGqWCHJdje_rP4QlN4PNPylXAd.xml b/resources/project/z1zMm7A1B3CIys2olxhHmFtBIcI/ZexGqWCHJdje_rP4QlN4PNPylXAd.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="design"/>
+    </Category>
+</Info>
diff --git a/resources/project/z1zMm7A1B3CIys2olxhHmFtBIcI/ZexGqWCHJdje_rP4QlN4PNPylXAp.xml b/resources/project/z1zMm7A1B3CIys2olxhHmFtBIcI/ZexGqWCHJdje_rP4QlN4PNPylXAp.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Info location="VarFun.mlx" type="File"/>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<Info location="Find.mlx" type="File"/>`