Skip to content

Commit b791ece

Browse files
committed
Merge branch 'master' of https://github.com/libmir/mir-algorithm
2 parents 4591cac + 3ace91b commit b791ece

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

source/mir/ndslice/slice.d

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,6 @@ Slice!(Universal, N, Iterator)
609609
Iterator _iterator
610610
-------
611611
+/
612-
alias Slice = mir_slice;
613-
/// ditto
614612
struct mir_slice(Iterator_, size_t N_ = 1, SliceKind kind_ = Contiguous)
615613
if (0 < N_ && N_ < 255 && !(kind_ == Canonical && N_ == 1))
616614
{
@@ -747,7 +745,7 @@ struct mir_slice(Iterator_, size_t N_ = 1, SliceKind kind_ = Contiguous)
747745
}
748746
}
749747

750-
public:
748+
public:
751749

752750
static if (S == 0)
753751
{
@@ -2964,6 +2962,9 @@ struct mir_slice(Iterator_, size_t N_ = 1, SliceKind kind_ = Contiguous)
29642962
}
29652963
}
29662964

2965+
/// ditto
2966+
alias Slice = mir_slice;
2967+
29672968
/++
29682969
Slicing, indexing, and arithmetic operations.
29692970
+/

source/mir/series.d

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ import std.meta;
159159
Plain index/time observation data structure.
160160
Observation are used as return tuple for for indexing $(LREF Series).
161161
+/
162-
alias Observation = mir_observation;
163-
/// ditto
164162
struct mir_observation(Index, Data)
165163
{
166164
/// Date, date-time, time, or index.
@@ -175,6 +173,9 @@ struct mir_observation(Index, Data)
175173
alias value = data;
176174
}
177175

176+
/// ditto
177+
alias Observation = mir_observation;
178+
178179
/// Convenient function for $(LREF Observation) construction.
179180
auto observation(Index, Data)(Index index, Data data)
180181
{
@@ -218,8 +219,6 @@ Plain index series data structure.
218219
Index is assumed to be sorted.
219220
$(LREF sort) can be used to normalise a series.
220221
+/
221-
alias Series = mir_series;
222-
/// ditto
223222
struct mir_series(IndexIterator, Iterator, size_t N = 1, SliceKind kind = Contiguous)
224223
{
225224
import std.range: SearchPolicy, assumeSorted;
@@ -1051,6 +1050,9 @@ struct mir_series(IndexIterator, Iterator, size_t N = 1, SliceKind kind = Contig
10511050
}
10521051
}
10531052

1053+
/// ditto
1054+
alias Series = mir_series;
1055+
10541056
/// 1-dimensional data
10551057
@safe pure version(mir_test) unittest
10561058
{

0 commit comments

Comments
 (0)