Skip to content

Commit 0cc61de

Browse files
ProMix0ProMix0
committed
Rename methods Tuple
1 parent 37e018f commit 0cc61de

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎NETMouse - .NET release/Utils/Tuple.Generators.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ public static Tuple<T, T2, T3, T4, T5, T6, T7> Of<T, T2, T3, T4, T5, T6, T7>(T i
9191
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
9292
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
9393
/// <returns>Êîðòåæ.</returns>
94-
public static Tuple<int, int> Rand2(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
94+
public static Tuple<int, int> Random2(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
9595
{
96-
return Of(Base.Rand(low, high), Base.Rand(low, high));
96+
return Of(Base.Random(low, high), Base.Random(low, high));
9797
}
9898

9999
/// <summary>
@@ -102,9 +102,9 @@ public static Tuple<int, int> Rand2(int low = Int32BordersHelper.Low, int high =
102102
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
103103
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
104104
/// <returns>Êîðòåæ.</returns>
105-
public static Tuple<int, int, int> Rand3(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
105+
public static Tuple<int, int, int> Random3(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
106106
{
107-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
107+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
108108
}
109109

110110
/// <summary>
@@ -113,9 +113,9 @@ public static Tuple<int, int, int> Rand3(int low = Int32BordersHelper.Low, int h
113113
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
114114
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
115115
/// <returns>Êîðòåæ.</returns>
116-
public static Tuple<int, int, int, int> Rand4(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
116+
public static Tuple<int, int, int, int> Random4(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
117117
{
118-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
118+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
119119
}
120120

121121
/// <summary>
@@ -124,9 +124,9 @@ public static Tuple<int, int, int, int> Rand4(int low = Int32BordersHelper.Low,
124124
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
125125
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
126126
/// <returns>Êîðòåæ.</returns>
127-
public static Tuple<int, int, int, int, int> Rand5(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
127+
public static Tuple<int, int, int, int, int> Random5(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
128128
{
129-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
129+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
130130
}
131131

132132
/// <summary>
@@ -135,9 +135,9 @@ public static Tuple<int, int, int, int, int> Rand5(int low = Int32BordersHelper.
135135
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
136136
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
137137
/// <returns>Êîðòåæ.</returns>
138-
public static Tuple<int, int, int, int, int, int> Rand6(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
138+
public static Tuple<int, int, int, int, int, int> Random6(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
139139
{
140-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
140+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
141141
}
142142

143143
/// <summary>
@@ -146,9 +146,9 @@ public static Tuple<int, int, int, int, int, int> Rand6(int low = Int32BordersHe
146146
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
147147
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
148148
/// <returns>Êîðòåæ.</returns>
149-
public static Tuple<int, int, int, int, int, int, int> Rand7(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
149+
public static Tuple<int, int, int, int, int, int, int> Random7(int low = Int32BordersHelper.Low, int high = Int32BordersHelper.High)
150150
{
151-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
151+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
152152
}
153153

154154
/// <summary>
@@ -157,9 +157,9 @@ public static Tuple<int, int, int, int, int, int, int> Rand7(int low = Int32Bord
157157
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
158158
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
159159
/// <returns>Êîðòåæ.</returns>
160-
public static Tuple<double, double> Rand2(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
160+
public static Tuple<double, double> Random2(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
161161
{
162-
return Of(Base.Rand(low, high), Base.Rand(low, high));
162+
return Of(Base.Random(low, high), Base.Random(low, high));
163163
}
164164

165165
/// <summary>
@@ -168,9 +168,9 @@ public static Tuple<double, double> Rand2(double low = DoubleBordersHelper.Low,
168168
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
169169
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
170170
/// <returns>Êîðòåæ.</returns>
171-
public static Tuple<double, double, double> Rand3(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
171+
public static Tuple<double, double, double> Random3(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
172172
{
173-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
173+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
174174
}
175175

176176
/// <summary>
@@ -179,9 +179,9 @@ public static Tuple<double, double, double> Rand3(double low = DoubleBordersHelp
179179
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
180180
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
181181
/// <returns>Êîðòåæ.</returns>
182-
public static Tuple<double, double, double, double> Rand4(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
182+
public static Tuple<double, double, double, double> Random4(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
183183
{
184-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
184+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
185185
}
186186

187187
/// <summary>
@@ -190,9 +190,9 @@ public static Tuple<double, double, double, double> Rand4(double low = DoubleBor
190190
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
191191
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
192192
/// <returns>Êîðòåæ.</returns>
193-
public static Tuple<double, double, double, double, double> Rand5(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
193+
public static Tuple<double, double, double, double, double> Random5(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
194194
{
195-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
195+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
196196
}
197197

198198
/// <summary>
@@ -201,9 +201,9 @@ public static Tuple<double, double, double, double, double> Rand5(double low = D
201201
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
202202
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
203203
/// <returns>Êîðòåæ.</returns>
204-
public static Tuple<double, double, double, double, double, double> Rand6(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
204+
public static Tuple<double, double, double, double, double, double> Random6(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
205205
{
206-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
206+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
207207
}
208208

209209
/// <summary>
@@ -212,9 +212,9 @@ public static Tuple<double, double, double, double, double, double> Rand6(double
212212
/// <param name="low">Íèæíÿÿ ãðàíèöà äèàïàçîíà.</param>
213213
/// <param name="high">Âåðõíÿÿ ãðàíèöà äèàïàçîíà.</param>
214214
/// <returns>Êîðòåæ.</returns>
215-
public static Tuple<double, double, double, double, double, double, double> Rand7(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
215+
public static Tuple<double, double, double, double, double, double, double> Random7(double low = DoubleBordersHelper.Low, double high = DoubleBordersHelper.High)
216216
{
217-
return Of(Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high), Base.Rand(low, high));
217+
return Of(Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high), Base.Random(low, high));
218218
}
219219

220220
/// <summary>

‎NETMouse - .NET release/Utils/Tuple.Input.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static partial class Tuple
1414
/// Читает кортеж из двух значений типа Boolean. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
1515
/// </summary>
1616
/// <returns>Кортеж.</returns>
17-
public static Tuple<bool, bool> ReadBooleanTup2(string prompt = EmptyStringHelper.Empty)
17+
public static Tuple<bool, bool> ReadBooleanTuple2(string prompt = EmptyStringHelper.Empty)
1818
{
1919
bool a = default;
2020
bool b = default;
@@ -29,7 +29,7 @@ public static Tuple<bool, bool> ReadBooleanTup2(string prompt = EmptyStringHelpe
2929
/// Читает кортеж из трёх значений типа Boolean. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
3030
/// </summary>
3131
/// <returns>Кортеж.</returns>
32-
public static Tuple<bool, bool, bool> ReadBooleanTup3(string prompt = EmptyStringHelper.Empty)
32+
public static Tuple<bool, bool, bool> ReadBooleanTuple3(string prompt = EmptyStringHelper.Empty)
3333
{
3434
bool a = default;
3535
bool b = default;
@@ -46,7 +46,7 @@ public static Tuple<bool, bool, bool> ReadBooleanTup3(string prompt = EmptyStrin
4646
/// Читает кортеж из двух значений типа Char. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
4747
/// </summary>
4848
/// <returns>Кортеж.</returns>
49-
public static Tuple<char, char> ReadCharTup2(string prompt = EmptyStringHelper.Empty)
49+
public static Tuple<char, char> ReadCharTuple2(string prompt = EmptyStringHelper.Empty)
5050
{
5151
return Of(Base.ReadChar(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 0)),
5252
Base.ReadChar(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 1)));
@@ -56,7 +56,7 @@ public static Tuple<char, char> ReadCharTup2(string prompt = EmptyStringHelper.E
5656
/// Читает кортеж из трёх значений типа Char. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
5757
/// </summary>
5858
/// <returns>Кортеж.</returns>
59-
public static Tuple<char, char, char> ReadCharTup3(string prompt = EmptyStringHelper.Empty)
59+
public static Tuple<char, char, char> ReadCharTuple3(string prompt = EmptyStringHelper.Empty)
6060
{
6161
return Of(Base.ReadChar(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 0)),
6262
Base.ReadChar(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 1)),
@@ -67,7 +67,7 @@ public static Tuple<char, char, char> ReadCharTup3(string prompt = EmptyStringHe
6767
/// Читает кортеж из двух значений типа Double. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
6868
/// </summary>
6969
/// <returns>Кортеж.</returns>
70-
public static Tuple<double, double> ReadDoubleTup2(string prompt = EmptyStringHelper.Empty)
70+
public static Tuple<double, double> ReadDoubleTuple2(string prompt = EmptyStringHelper.Empty)
7171
{
7272
double a = default;
7373
double b = default;
@@ -82,7 +82,7 @@ public static Tuple<double, double> ReadDoubleTup2(string prompt = EmptyStringHe
8282
/// Читает кортеж из трёх значений типа Double. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
8383
/// </summary>
8484
/// <returns>Кортеж.</returns>
85-
public static Tuple<double, double, double> ReadDoubleTup3(string prompt = EmptyStringHelper.Empty)
85+
public static Tuple<double, double, double> ReadDoubleTuple3(string prompt = EmptyStringHelper.Empty)
8686
{
8787
double a = default;
8888
double b = default;
@@ -99,7 +99,7 @@ public static Tuple<double, double, double> ReadDoubleTup3(string prompt = Empty
9999
/// Читает кортеж из двух значений типа Int32. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
100100
/// </summary>
101101
/// <returns>Кортеж.</returns>
102-
public static Tuple<int, int> ReadInt32Tup2(string prompt = EmptyStringHelper.Empty)
102+
public static Tuple<int, int> ReadInt32Tuple2(string prompt = EmptyStringHelper.Empty)
103103
{
104104
int a = default;
105105
int b = default;
@@ -114,7 +114,7 @@ public static Tuple<int, int> ReadInt32Tup2(string prompt = EmptyStringHelper.Em
114114
/// Читает кортеж из трёх значений типа Int32. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
115115
/// </summary>
116116
/// <returns>Кортеж.</returns>
117-
public static Tuple<int, int, int> ReadInt32Tup3(string prompt = EmptyStringHelper.Empty)
117+
public static Tuple<int, int, int> ReadInt32Tuple3(string prompt = EmptyStringHelper.Empty)
118118
{
119119
int a = default;
120120
int b = default;
@@ -131,7 +131,7 @@ public static Tuple<int, int, int> ReadInt32Tup3(string prompt = EmptyStringHelp
131131
/// Читает кортеж из двух значений типа String. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
132132
/// </summary>
133133
/// <returns>Кортеж.</returns>
134-
public static Tuple<string, string> ReadStringTup2(string prompt = EmptyStringHelper.Empty)
134+
public static Tuple<string, string> ReadStringTuple2(string prompt = EmptyStringHelper.Empty)
135135
{
136136
return Of(Base.ReadString(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 0)),
137137
Base.ReadString(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 1)));
@@ -141,7 +141,7 @@ public static Tuple<string, string> ReadStringTup2(string prompt = EmptyStringHe
141141
/// Читает кортеж из трёх значений типа String. [Не работает при запуске из под оболочки в IDE PascalABC.NET.]
142142
/// </summary>
143143
/// <returns>Кортеж.</returns>
144-
public static Tuple<string, string, string> ReadStringTup3(string prompt = EmptyStringHelper.Empty)
144+
public static Tuple<string, string, string> ReadStringTuple3(string prompt = EmptyStringHelper.Empty)
145145
{
146146
return Of(Base.ReadString(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 0)),
147147
Base.ReadString(prompt is null ? EmptyStringHelper.Empty : string.Format(prompt, 1)),

0 commit comments

Comments
 (0)