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

feat: adds unit support to ceil, floor, and fix functions #3269

Merged

Conversation

orelbn
Copy link
Contributor

@orelbn orelbn commented Sep 22, 2024

Description

Test

  • Added automated unit-tests

Additional Notes

  • I wasn't able to run the type tests locally. Can you please verify that they are passing properly?

@orelbn orelbn marked this pull request as ready for review September 22, 2024 04:21
Copy link
Owner

@josdejong josdejong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Orel! This is exactly what we're looking for, nice job. Thanks for updating all the docs and TypeScript types. The types run fine, they run via Github Actions of this PR and all checks are green.

I've made one inline comment, can you have a look at that?

src/function/arithmetic/ceil.js Show resolved Hide resolved
@orelbn orelbn requested a review from josdejong September 25, 2024 19:11
@orelbn
Copy link
Contributor Author

orelbn commented Sep 25, 2024

Is there a restriction that the matrix or array must contain only units? I believe that to be the case. If so, I would like to update the types further. I would like to do it in a separate PR.

Copy link
Owner

@josdejong josdejong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the updates. I made two more comments, can you have a look at those?

Is there a restriction that the matrix or array must contain only units?

Matrices can contain mixed content of numbers, units, complex numbers etc. There is still an issue in that regard though: the type definitions currently do not allow to have a matrix containing units at all:

export type MathArray = MathNumericType[] | MathNumericType[][] // TODO: MathArray can also contain Unit

Maybe best to address that issue separately though.

src/function/arithmetic/ceil.js Outdated Show resolved Hide resolved
types/index.d.ts Show resolved Hide resolved
@orelbn
Copy link
Contributor Author

orelbn commented Sep 29, 2024

Thanks for the updates. I made two more comments, can you have a look at those?

Is there a restriction that the matrix or array must contain only units?

Matrices can contain mixed content of numbers, units, complex numbers etc. There is still an issue in that regard though: the type definitions currently do not allow to have a matrix containing units at all:

export type MathArray = MathNumericType[] | MathNumericType[][] // TODO: MathArray can also contain Unit

Maybe best to address that issue separately though.

Thank you for the clarification! Is the desired behaviour that matrices and arrays only contain units when the second or third argument to the ceil, floor, fix, or round function is a unit?

For example, round([1], unit('cm')) throws an error, as does round([1, unit('2 cm')], 2, unit('cm')), but that is not reflected in the current type definition.

round<U extends MathCollection>(x: U, n: number | BigNumber, unit: Unit): U

Proposed new type definition:

round(Unit[] | Unit[][] | UnitMatrix, number | BigNumber, Unit)
round(Unit[] | Unit[][] | UnitMatrix, Unit)

@josdejong
Copy link
Owner

Is the desired behaviour that matrices and arrays only contain units when the second or third argument to the ceil, floor, fix, or round function is a unit?

That makes sense indeed! Can you refine the type definitions with your proposal?

@orelbn
Copy link
Contributor Author

orelbn commented Oct 6, 2024

Is the desired behaviour that matrices and arrays only contain units when the second or third argument to the ceil, floor, fix, or round function is a unit?

That makes sense indeed! Can you refine the type definitions with your proposal?

I played around with it a bit.

This is what I believe the tasks that are required:

  1. Expand the Matrix and MathArray types to accept Units.
  2. Add a utility for checking whether an Array is a UnitArray and Matrix is a UnitMatrix

From a user perspective, if they create an array that contains multiple types they will get this error

  const array = []
  array.push(u1)
  array.push(u3)
  array.push(1)
  array.pop()

  math.ceil(array, 1, math.unit('cm'))

Pasted Graphic

They can use the utility (although slow since it has to go through. the entire array/matrix) or assert the type.

if (isUnitArray(array)) math.ceil(array, 1, math.unit('cm'))
or
math.ceil(array as UnitArray, 1, math.unit('cm'))

@josdejong
Copy link
Owner

Thanks for the updates!

The improved TypeScript support is awesome, and with the generic MathCollection<T> we can refine a lot more of the type definitions. However we're already getting out of scope of this PR so let's limit what we do in this PR 😅.

Two questions:

  1. There are some subtle changes in the existing type definitions (like for multiply). Are you sure there are no breaking changes in the types?

  2. Thinking aloud here: I'm a bit in doubt about the typeguards isUnitArray and isUnitMatrix as they are. I think we can use more fundamental helper functions to determine whether a matrix/array contains a single data type (i.e. is homogeneous). Not just for units but for any type. So we would need something more generic like isHomogeneousArray(array, isComplex) or isArrayOfType(isComplex). The ideal TypeScript notation would be something like isArray<Complex>(). Maybe we should implement it a method for this on DenseMatrix and SparseMatrix which verifies the contents and sets the internal datatype (which optimizes evaluation) and sets the TypeScript type.

    In short: this needs some more thinking-through, and maybe it is best to keep that out of scope of this PR and address in a separate discussion. Until then, it would be best not to export new helper functions like isUnitArray as long as we're not sure what the final API will be. What do you think?

@orelbn
Copy link
Contributor Author

orelbn commented Oct 11, 2024

Thanks for the updates!

The improved TypeScript support is awesome, and with the generic MathCollection<T> we can refine a lot more of the type definitions. However we're already getting out of scope of this PR so let's limit what we do in this PR 😅.

Two questions:

  1. There are some subtle changes in the existing type definitions (like for multiply). Are you sure there are no breaking changes in the types?
  2. Thinking aloud here: I'm a bit in doubt about the typeguards isUnitArray and isUnitMatrix as they are. I think we can use more fundamental helper functions to determine whether a matrix/array contains a single data type (i.e. is homogeneous). Not just for units but for any type. So we would need something more generic like isHomogeneousArray(array, isComplex) or isArrayOfType(isComplex). The ideal TypeScript notation would be something like isArray<Complex>(). Maybe we should implement it a method for this on DenseMatrix and SparseMatrix which verifies the contents and sets the internal datatype (which optimizes evaluation) and sets the TypeScript type.
    In short: this needs some more thinking-through, and maybe it is best to keep that out of scope of this PR and address in a separate discussion. Until then, it would be best not to export new helper functions like isUnitArray as long as we're not sure what the final API will be. What do you think?

Sorry for the delayed response. Very busy this past week.

All of your suggestions sound great. Thank you for the input 😄 ! I will remove the type guards and address your suggestion in a separate PR. I agree that there is definitely more thinking to do.

Regarding the multiply, I will take a look again.

After further look:
There are breaking changes, so we will want to see how we want to handle that.

image

Not all array operations are supported on unit arrays, so if we say that MathArrays can include units.
The above code won't capture the first two definitions of the multiply function since it expects MathArray to translate down to MathNumericType[] => but in the current PR, I said that MathArray translates down to MathScalarType[]

  multiply<T extends MathNumericType[]>(x: T, y: T[]): T
  multiply<T extends MathNumericType[]>(x: T[], y: T): T

So what I can do for now is set the default to a MathNumerticType<T extends MathScalarType = MathNumericType>, but you can explicitly still set it to MathScalarType .

I will address the type guard sometime in the next couple of days.

@orelbn
Copy link
Contributor Author

orelbn commented Oct 12, 2024

I did find a small error in one of the multiply function types. Would you like me to file an issue or fix it in one of the upcoming PRs?

Error in function type: multiplication of two MathArrays does not necessarily result in a MathArray.

multiply<T extends MathArray>(x: T, y: T): T

To Reproduce
Steps to reproduce the behavior.

Multiply two single-dimensional arrays together, and the result is a number.

image
image
image

@orelbn orelbn requested a review from josdejong October 15, 2024 16:24
Copy link
Owner

@josdejong josdejong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the updates, I think we're there! I made one last small remark, can you have a look at that?

Good find about the wrong types when multiplying two vectors. In that case mathjs returns a scalar value, and not an array containing one value. Since this is not a regression introduced in this PR but an existing bug in the type definitions, I think it's best to create a separate PR improving the types for vector multiplication, ok?

I've had a thorough look at the changes in the type definitions. I expect the changes are not be breaking in normal, practical cases, but there may be tricky edge cases that have breaking behavior. To be careful in this regard, I would like to merge this PR into the next major version v14, ok? (I plan to release v14 "soonish", within a couple of weeks).

test/typescript-tests/testTypes.ts Outdated Show resolved Hide resolved
@josdejong josdejong added this to the v14 milestone Oct 18, 2024
@josdejong josdejong mentioned this pull request Oct 18, 2024
7 tasks
@orelbn
Copy link
Contributor Author

orelbn commented Oct 18, 2024

ad a thorough look at the changes in the type definitions. I expect the changes are not be breaking in normal, practical cases, but there may be tricky edge cases that have breaking behavior. To be careful in this reg

That sounds good. I will address the vector multiplication types separately.

Adding the functionality in version 14 is completely fine with me.

Thank you for the in-depth review 😄

@josdejong josdejong changed the base branch from develop to v14 October 21, 2024 10:47
@josdejong josdejong merged commit 9dca98b into josdejong:v14 Oct 21, 2024
8 checks passed
@josdejong
Copy link
Owner

Thanks! Merged now in the v14 branch.

@josdejong
Copy link
Owner

Published now in v14.0.0. Thanks again Orel.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants