[RangeBoxes] Remove redundant parameters of ToString

aardvark-platform · Jun 18, 2024 · a4e5aac · a4e5aac
1 parent 737300c
commit a4e5aac
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 60 deletions.
diff --git a/src/Aardvark.Base/Math/RangesBoxes/Box_auto.cs b/src/Aardvark.Base/Math/RangesBoxes/Box_auto.cs
@@ -797,17 +797,16 @@ public static Range1b Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -1789,17 +1788,16 @@ public static Range1sb Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -2781,17 +2779,16 @@ public static Range1s Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -3773,17 +3770,16 @@ public static Range1us Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -4765,17 +4761,16 @@ public static Range1i Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -5757,17 +5752,16 @@ public static Range1ui Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -6749,17 +6743,16 @@ public static Range1l Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -7741,17 +7734,16 @@ public static Range1ul Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -8752,17 +8744,16 @@ public static Range1f Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -9763,17 +9754,16 @@ public static Range1d Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]");
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        public readonly string ToString(string format, IFormatProvider fp, string begin, string between, string end)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp) + betweenB
-                          + Max.ToString(format, fp) + endB;
+            return begin + Min.ToString(format, fp) + between + Max.ToString(format, fp) + end;
         }
 
         #endregion
@@ -11100,8 +11090,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -12631,8 +12620,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -14279,8 +14267,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -15916,8 +15903,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -17418,8 +17404,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -19306,8 +19291,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -21317,8 +21301,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion
@@ -23316,8 +23299,7 @@ public readonly string ToString(string format, IFormatProvider fp)
         public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
         {
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB
-                          + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
+            return beginB + Min.ToString(format, fp, beginV, betweenV, endV) + betweenB + Max.ToString(format, fp, beginV, betweenV, endV) + endB;
         }
 
         #endregion

diff --git a/src/Aardvark.Base/Math/RangesBoxes/Box_template.cs b/src/Aardvark.Base/Math/RangesBoxes/Box_template.cs
@@ -1517,18 +1517,20 @@ public static __type__ Parse(Text t)
 
         public readonly string ToString(string format, IFormatProvider fp)
         {
-            return ToString(format, fp, "[", ", ", "]", "[", ", ", "]");
+            return ToString(format, fp, "[", ", ", "]"/*# if (dim > 1) {*/, "[", ", ", "]"/*# }*/);
         }
 
         /// <summary>
         /// Outputs e.g. a Box2 in the form "(beginB)(beginV)min.x(betweenV)min.y(endV)(betweenB)(beginV)max.x(betweenV)max.y(endV)(endB)".
         /// </summary>
-        public readonly string ToString(string format, IFormatProvider fp, string beginB, string betweenB, string endB, string beginV, string betweenV, string endV)
+        //# var begin = "begin" + ((dim > 1) ? "B" : "");
+        //# var between = "between" + ((dim > 1) ? "B" : "");
+        //# var end = "end" + ((dim > 1) ? "B" : "");
+        public readonly string ToString(string format, IFormatProvider fp, string __begin__, string __between__, string __end__/*# if (dim > 1) {*/, string beginV, string betweenV, string endV/*# }*/)
         {
             //# var format = "format, fp" + (dim > 1 ? ", beginV, betweenV, endV" : "");
             if (fp == null) fp = CultureInfo.InvariantCulture;
-            return beginB + Min.ToString(__format__) + betweenB
-                          + Max.ToString(__format__) + endB;
+            return __begin__ + Min.ToString(__format__) + __between__ + Max.ToString(__format__) + __end__;
         }
 
         #endregion