Skip to content

Commit

Permalink
fix: Removing name from cost curves and function data
Browse files Browse the repository at this point in the history
  • Loading branch information
pesap committed Sep 19, 2024
1 parent dd7dbed commit 9c35e68
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/infrasys/cost_curves.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from typing_extensions import Annotated
from infrasys.component import Component
from pydantic import Field
from infrasys.models import InfraSysBaseModelWithIdentifers
from infrasys.value_curves import InputOutputCurve, IncrementalCurve, AverageRateCurve, LinearCurve
import pint


class ProductionVariableCostCurve(Component):
name: Annotated[str, Field(frozen=True)] = ""
class ProductionVariableCostCurve(InfraSysBaseModelWithIdentifers):
...


class CostCurve(ProductionVariableCostCurve):
Expand Down
16 changes: 9 additions & 7 deletions src/infrasys/function_data.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
"""Defines models for cost functions"""

from infrasys import Component
from typing_extensions import Annotated
from pydantic import Field, model_validator
from pydantic.functional_validators import AfterValidator
from typing import NamedTuple, List
from typing import List, NamedTuple

import numpy as np
import pint
from pydantic import Field, model_validator
from pydantic.functional_validators import AfterValidator
from typing_extensions import Annotated

from infrasys.models import InfraSysBaseModelWithIdentifers


class XYCoords(NamedTuple):
Expand All @@ -16,10 +18,10 @@ class XYCoords(NamedTuple):
y: float


class FunctionData(Component):
class FunctionData(InfraSysBaseModelWithIdentifers):
"""BaseClass of FunctionData"""

name: Annotated[str, Field(frozen=True)] = ""
...


class LinearFunctionData(FunctionData):
Expand Down
6 changes: 3 additions & 3 deletions src/infrasys/value_curves.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Defines classes for value curves using cost functions"""

from typing_extensions import Annotated
from infrasys.component import Component
from infrasys.exceptions import ISOperationNotAllowed
from infrasys.function_data import (
LinearFunctionData,
Expand All @@ -13,9 +12,10 @@
from pydantic import Field
import numpy as np

from infrasys.models import InfraSysBaseModelWithIdentifers

class ValueCurve(Component):
name: Annotated[str, Field(frozen=True)] = ""

class ValueCurve(InfraSysBaseModelWithIdentifers):
input_at_zero: Annotated[
float | None,
Field(
Expand Down

0 comments on commit 9c35e68

Please sign in to comment.