Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(rust)!: rename expand_at_index -> new_from_index #5259

Merged
merged 1 commit into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions polars/polars-core/src/chunked_array/bitwise.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ impl BitOr for &BooleanChunked {
rhs.rename(self.name());
rhs
}
None => &self.expand_at_index(0, rhs.len()) | rhs,
None => &self.new_from_index(0, rhs.len()) | rhs,
};
}
(_, 1) => {
return match rhs.get(0) {
Some(true) => BooleanChunked::full(self.name(), true, self.len()),
Some(false) => self.clone(),
None => &rhs.expand_at_index(0, self.len()) | self,
None => &rhs.new_from_index(0, self.len()) | self,
};
}
_ => {}
Expand Down Expand Up @@ -168,14 +168,14 @@ impl BitXor for &BooleanChunked {
rhs.rename(self.name());
rhs
}
None => &self.expand_at_index(0, rhs.len()) | rhs,
None => &self.new_from_index(0, rhs.len()) | rhs,
};
}
(_, 1) => {
return match rhs.get(0) {
Some(true) => self.not(),
Some(false) => self.clone(),
None => &rhs.expand_at_index(0, self.len()) | self,
None => &rhs.new_from_index(0, self.len()) | self,
};
}
_ => {}
Expand Down Expand Up @@ -218,14 +218,14 @@ impl BitAnd for &BooleanChunked {
return match self.get(0) {
Some(true) => rhs.clone(),
Some(false) => BooleanChunked::full(self.name(), false, rhs.len()),
None => &self.expand_at_index(0, rhs.len()) & rhs,
None => &self.new_from_index(0, rhs.len()) & rhs,
};
}
(_, 1) => {
return match rhs.get(0) {
Some(true) => self.clone(),
Some(false) => BooleanChunked::full(self.name(), false, self.len()),
None => self & &rhs.expand_at_index(0, self.len()),
None => self & &rhs.new_from_index(0, self.len()),
};
}
_ => {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl StructChunked {
if s_len == max_len {
new_fields.push(s.clone())
} else if s_len == 1 {
new_fields.push(s.expand_at_index(0, max_len))
new_fields.push(s.new_from_index(0, max_len))
} else {
return Err(PolarsError::ShapeMisMatch(
"expected all fields to have equal length".into(),
Expand Down
14 changes: 7 additions & 7 deletions polars/polars-core/src/chunked_array/ops/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ pub trait ChunkFilter<T: PolarsDataType> {
/// Create a new ChunkedArray filled with values at that index.
pub trait ChunkExpandAtIndex<T: PolarsDataType> {
/// Create a new ChunkedArray filled with values at that index.
fn expand_at_index(&self, length: usize, index: usize) -> ChunkedArray<T>;
fn new_from_index(&self, length: usize, index: usize) -> ChunkedArray<T>;
}

macro_rules! impl_chunk_expand {
Expand All @@ -622,32 +622,32 @@ where
ChunkedArray<T>: ChunkFull<T::Native> + TakeRandom<Item = T::Native>,
T: PolarsNumericType,
{
fn expand_at_index(&self, index: usize, length: usize) -> ChunkedArray<T> {
fn new_from_index(&self, index: usize, length: usize) -> ChunkedArray<T> {
impl_chunk_expand!(self, length, index)
}
}

impl ChunkExpandAtIndex<BooleanType> for BooleanChunked {
fn expand_at_index(&self, index: usize, length: usize) -> BooleanChunked {
fn new_from_index(&self, index: usize, length: usize) -> BooleanChunked {
impl_chunk_expand!(self, length, index)
}
}

impl ChunkExpandAtIndex<Utf8Type> for Utf8Chunked {
fn expand_at_index(&self, index: usize, length: usize) -> Utf8Chunked {
fn new_from_index(&self, index: usize, length: usize) -> Utf8Chunked {
impl_chunk_expand!(self, length, index)
}
}

#[cfg(feature = "dtype-binary")]
impl ChunkExpandAtIndex<BinaryType> for BinaryChunked {
fn expand_at_index(&self, index: usize, length: usize) -> BinaryChunked {
fn new_from_index(&self, index: usize, length: usize) -> BinaryChunked {
impl_chunk_expand!(self, length, index)
}
}

impl ChunkExpandAtIndex<ListType> for ListChunked {
fn expand_at_index(&self, index: usize, length: usize) -> ListChunked {
fn new_from_index(&self, index: usize, length: usize) -> ListChunked {
let opt_val = self.get(index);
match opt_val {
Some(val) => ListChunked::full(self.name(), &val, length),
Expand All @@ -658,7 +658,7 @@ impl ChunkExpandAtIndex<ListType> for ListChunked {

#[cfg(feature = "object")]
impl<T: PolarsObject> ChunkExpandAtIndex<ObjectType<T>> for ObjectChunked<T> {
fn expand_at_index(&self, index: usize, length: usize) -> ObjectChunked<T> {
fn new_from_index(&self, index: usize, length: usize) -> ObjectChunked<T> {
let opt_val = self.get(index);
match opt_val {
Some(val) => ObjectChunked::<T>::full(self.name(), val.clone(), length),
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/src/doc/changelog/v0_7.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//! * Rem trait implemented for Series and ChunkedArrays
//! * ChunkedArrays broadcasting arithmetic
//! * ChunkedArray/Series `zip_with` operation
//! * ChunkedArray/Series `expand_at_index` operation
//! * ChunkedArray/Series `new_from_index` operation
//! * laziness api initiated.
//! - Predicate pushdown optimizer
//! - Projection pushdown optimizer
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/src/frame/arithmetic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl DataFrame {
// trick to fill a series with nulls
let vals: &[Option<i32>] = &[None];
let s = Series::new(name, vals).cast(dtype)?;
cols.push(s.expand_at_index(0, max_len))
cols.push(s.new_from_index(0, max_len))
}
}
DataFrame::new(cols)
Expand Down
6 changes: 3 additions & 3 deletions polars/polars-core/src/frame/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ impl DataFrame {
fn inner(df: &mut DataFrame, mut series: Series) -> PolarsResult<&mut DataFrame> {
let height = df.height();
if series.len() == 1 && height > 1 {
series = series.expand_at_index(0, height);
series = series.new_from_index(0, height);
}

if series.len() == height || df.is_empty() {
Expand Down Expand Up @@ -1169,7 +1169,7 @@ impl DataFrame {

let height = self.height();
if series.len() == 1 && height > 1 {
series = series.expand_at_index(0, height);
series = series.new_from_index(0, height);
}

if series.len() == height || self.is_empty() {
Expand Down Expand Up @@ -2042,7 +2042,7 @@ impl DataFrame {
let new_col = f(col).into_series();
match new_col.len() {
1 => {
let new_col = new_col.expand_at_index(0, df_height);
let new_col = new_col.new_from_index(0, df_height);
let _ = mem::replace(col, new_col);
}
len if (len == df_height) => {
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ pub fn concat_str(s: &[Series], delimiter: &str) -> PolarsResult<Utf8Chunked> {
let mut ca = s.utf8()?.clone();
// broadcast
if ca.len() == 1 && len > 1 {
ca = ca.expand_at_index(0, len)
ca = ca.new_from_index(0, len)
}

Ok(ca)
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/binary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ impl SeriesTrait for SeriesWrap<BinaryChunked> {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/boolean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ impl SeriesTrait for SeriesWrap<BooleanChunked> {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/categorical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ impl SeriesTrait for SeriesWrap<CategoricalChunked> {
self.with_state(true, |ca| ca.rechunk()).into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
self.with_state(true, |cats| cats.expand_at_index(index, length))
fn new_from_index(&self, index: usize, length: usize) -> Series {
self.with_state(true, |cats| cats.new_from_index(index, length))
.into_series()
}

Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/dates_time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,9 @@ macro_rules! impl_dyn_series {
self.0.rechunk().$into_logical().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
fn new_from_index(&self, index: usize, length: usize) -> Series {
self.0
.expand_at_index(index, length)
.new_from_index(index, length)
.$into_logical()
.into_series()
}
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,9 @@ impl SeriesTrait for SeriesWrap<DatetimeChunked> {
.into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
fn new_from_index(&self, index: usize, length: usize) -> Series {
self.0
.expand_at_index(index, length)
.new_from_index(index, length)
.into_datetime(self.0.time_unit(), self.0.time_zone().clone())
.into_series()
}
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/duration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,9 @@ impl SeriesTrait for SeriesWrap<DurationChunked> {
.into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
fn new_from_index(&self, index: usize, length: usize) -> Series {
self.0
.expand_at_index(index, length)
.new_from_index(index, length)
.into_duration(self.0.time_unit())
.into_series()
}
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/floats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ macro_rules! impl_dyn_series {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ impl SeriesTrait for SeriesWrap<ListChunked> {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ macro_rules! impl_dyn_series {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ where
self.0.take_every(n).into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, _data_type: &DataType) -> PolarsResult<Series> {
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/struct_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,9 @@ impl SeriesTrait for SeriesWrap<StructChunked> {
out.into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
fn new_from_index(&self, index: usize, length: usize) -> Series {
self.0
.apply_fields(|s| s.expand_at_index(index, length))
.apply_fields(|s| s.new_from_index(index, length))
.into_series()
}

Expand Down
4 changes: 2 additions & 2 deletions polars/polars-core/src/series/implementations/utf8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ impl SeriesTrait for SeriesWrap<Utf8Chunked> {
self.0.rechunk().into_series()
}

fn expand_at_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::expand_at_index(&self.0, index, length).into_series()
fn new_from_index(&self, index: usize, length: usize) -> Series {
ChunkExpandAtIndex::new_from_index(&self.0, index, length).into_series()
}

fn cast(&self, data_type: &DataType) -> PolarsResult<Series> {
Expand Down
2 changes: 1 addition & 1 deletion polars/polars-core/src/series/ops/extend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ impl Series {
dt => panic!("{:?} not supported", dt),
};
let s = s.cast(self.dtype())?;
let to_append = s.expand_at_index(0, n);
let to_append = s.new_from_index(0, n);

let mut out = self.clone();
out.append(&to_append)?;
Expand Down
8 changes: 4 additions & 4 deletions polars/polars-core/src/series/series_trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,17 +381,17 @@ pub trait SeriesTrait:
None
}

/// Create a new Series filled with values at that index.
/// Create a new Series filled with values from the given index.
///
/// # Example
///
/// ```rust
/// use polars_core::prelude::*;
/// let s = Series::new("a", [0i32, 1, 8]);
/// let expanded = s.expand_at_index(2, 4);
/// assert_eq!(Vec::from(expanded.i32().unwrap()), &[Some(8), Some(8), Some(8), Some(8)])
/// let s2 = s.new_from_index(2, 4);
/// assert_eq!(Vec::from(s2.i32().unwrap()), &[Some(8), Some(8), Some(8), Some(8)])
/// ```
fn expand_at_index(&self, _index: usize, _length: usize) -> Series {
fn new_from_index(&self, _index: usize, _length: usize) -> Series {
invalid_operation_panic!(self)
}

Expand Down
Loading