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.

Sign up for GitHub

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

Jump to bottom

Add TSequenceSet constructor to create sequence set from instants with gaps #56

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add TSequenceSet constructor to create sequence set from instants with gaps #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
88a8549
Add constructor for sequence sets using instants with gaps
Diviloper May 5, 2024
0a6c814
Add tests for TBoolSeqSet
Diviloper May 5, 2024
de3b67d
Add test for linera interpolation
Diviloper May 6, 2024
3f3ef3a
Add TFloat tests
Diviloper May 6, 2024
8bee59a
Add TInt tests
Diviloper May 6, 2024
32e8d34
Add TText tests
Diviloper May 6, 2024
3abbb18
Add Discrete interpolation tests
Diviloper May 6, 2024
c51c59a
Add TPoint Tests
Diviloper May 6, 2024
19fe883
Run black formatter
Diviloper May 12, 2024
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
20 changes: 18 additions & 2 deletions pymeos/temporal/tsequenceset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
from __future__ import annotations

from abc import ABC
from datetime import timedelta
from typing import Optional, List, Union, Any, TypeVar, Type, TYPE_CHECKING

from pymeos_cffi import *

from .temporal import Temporal, import_pandas
from .temporal import Temporal, import_pandas, TInterpolation

if TYPE_CHECKING:
import pandas as pd


TBase = TypeVar("TBase")
TG = TypeVar("TG", bound="Temporal[Any]")
TI = TypeVar("TI", bound="TInstant[Any]")
Expand Down Expand Up @@ -71,6 +71,22 @@ def from_sequences(
"""
return cls(sequence_list=sequence_list, normalize=normalize)

@classmethod
def from_instants_with_gaps(
cls,
instants: list[TI],
interpolation: TInterpolation,
max_time: timedelta = None,
max_distance: float = 0.0,
):
instant_inners = [x._inner for x in instants]
interval = timedelta_to_interval(max_time) if max_time is not None else None
return cls(
_inner=tsequenceset_make_gaps(
instant_inners, interpolation, interval, max_distance
)
)

# ------------------------- Accessors -------------------------------------
def num_sequences(self) -> int:
"""
Expand Down
58 changes: 58 additions & 0 deletions tests/main/tbool_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
TsTzSpan,
TsTzSpanSet,
)
from pymeos_cffi import MeosException
from tests.conftest import TestPyMEOS


Expand Down Expand Up @@ -249,6 +250,63 @@ def test_instant_list_sequence_constructor(
assert str(tbs2) == expected
assert tbs2.interpolation() == interpolation

@pytest.mark.parametrize(
"params, result",
[
(
(
[
TBoolInst("True@2000-01-01"),
TBoolInst("False@2000-01-02"),
TBoolInst("False@2000-01-05"),
],
TInterpolation.STEPWISE,
None,
),
TBoolSeqSet("{[True@2000-01-01, False@2000-01-02, False@2000-01-05]}"),
),
(
(
[
TBoolInst("True@2000-01-01"),
TBoolInst("False@2000-01-02"),
TBoolInst("False@2000-01-05"),
],
TInterpolation.STEPWISE,
timedelta(days=2),
),
TBoolSeqSet(
"{[True@2000-01-01, False@2000-01-02], [False@2000-01-05]}"
),
),
],
ids=["No Gaps", "With Gaps"],
)
def test_gaps_constructor(self, params, result):
assert TBoolSeqSet.from_instants_with_gaps(*params) == result

@pytest.mark.parametrize(
"params",
[
{"interpolation": TInterpolation.STEPWISE, "max_distance": 2},
{"interpolation": TInterpolation.LINEAR},
{"interpolation": TInterpolation.DISCRETE},
],
ids=[
"Max Distance",
"Linear Interpolation",
"Discrete Interpolation",
],
)
def test_gaps_constructor_with_invalid_parameters_raises(self, params):
instants = [
TBoolInst(value=True, timestamp="2000-01-01"),
TBoolInst(value=False, timestamp="2000-01-02"),
TBoolInst(value=False, timestamp="2000-01-03"),
]
with pytest.raises(MeosException):
TBoolSeqSet.from_instants_with_gaps(instants, **params)

@pytest.mark.parametrize(
"temporal",
[tbi, tbds, tbs, tbss],
Expand Down
146 changes: 145 additions & 1 deletion tests/main/tfloat_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from operator import not_

import pytest
from pymeos_cffi import MeosInvalidArgValueError
from pymeos_cffi import MeosInvalidArgValueError, MeosException

from pymeos import (
TBoolInst,
Expand Down Expand Up @@ -259,6 +259,150 @@ def test_instant_list_sequence_constructor(
assert str(tfs2) == expected
assert tfs2.interpolation() == interpolation

@pytest.mark.parametrize(
"params, result",
[
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.STEPWISE,
None,
),
TFloatSeqSet(
"Interp=Step;{[1@2000-01-01, 5@2000-01-02, 6@2000-01-05]}"
),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.STEPWISE,
None,
2.0,
),
TFloatSeqSet(
"Interp=Step;{[1@2000-01-01], [5@2000-01-02, 6@2000-01-05]}"
),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.STEPWISE,
timedelta(days=2),
),
TFloatSeqSet(
"Interp=Step;{[1@2000-01-01, 5@2000-01-02], [6@2000-01-05]}"
),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.STEPWISE,
timedelta(days=2),
2.0,
),
TFloatSeqSet(
"Interp=Step;{[1@2000-01-01], [5@2000-01-02], [6@2000-01-05]}"
),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.LINEAR,
None,
),
TFloatSeqSet("{[1@2000-01-01, 5@2000-01-02, 6@2000-01-05]}"),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.LINEAR,
None,
2.0,
),
TFloatSeqSet("{[1@2000-01-01], [5@2000-01-02, 6@2000-01-05]}"),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.LINEAR,
timedelta(days=2),
),
TFloatSeqSet("{[1@2000-01-01, 5@2000-01-02], [6@2000-01-05]}"),
),
(
(
[
TFloatInst("1@2000-01-01"),
TFloatInst("5@2000-01-02"),
TFloatInst("6@2000-01-05"),
],
TInterpolation.LINEAR,
timedelta(days=2),
2.0,
),
TFloatSeqSet("{[1@2000-01-01], [5@2000-01-02], [6@2000-01-05]}"),
),
],
ids=[
"No Gaps Stepwise",
"Value Gaps Stepwise",
"Time Gaps Stepwise",
"Value and Time Gaps Stepwise",
"No Gaps Linear",
"Value Gaps Linear",
"Time Gaps Linear",
"Value and Time Gaps Linear",
],
)
def test_gaps_constructor(self, params, result):
assert TFloatSeqSet.from_instants_with_gaps(*params) == result

@pytest.mark.parametrize(
"params",
[
{"interpolation": TInterpolation.DISCRETE},
],
ids=[
"Discrete Interpolation",
],
)
def test_gaps_constructor_with_invalid_parameters_raises(self, params):
instants = [
TFloatInst(value=1, timestamp="2000-01-01"),
TFloatInst(value=5, timestamp="2000-01-02"),
TFloatInst(value=6, timestamp="2000-01-03"),
]
with pytest.raises(MeosException):
TFloatSeqSet.from_instants_with_gaps(instants, **params)

@pytest.mark.parametrize(
"temporal",
[tfi, tfds, tfs, tfss, tfsts, tfstss],
Expand Down
Loading
Loading