Commitd49737f

committed

Let MultiNorm inherit from Norm ABC

1 parentbd8e726 commitd49737fCopy full SHA for d49737f

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3277,7 +3277,7 @@ def inverse(self, value):`
`3277`	`3277`	`returnvalue`
`3278`	`3278`
`3279`	`3279`
`3280`		`-classMultiNorm(Normalize):`
	`3280`	`+classMultiNorm(Norm):`
`3281`	`3281`	`"""`
`3282`	`3282`	`A class which contains multiple scalar norms`
`3283`	`3283`	`"""`
`@@ -3442,6 +3442,12 @@ def autoscale(self, A):`
`3442`	`3442`	`"""`
`3443`	`3443`	`For each constituent norm, Set vmin, vmax to min, max of the corresponding`
`3444`	`3444`	`variate in A.`
	`3445`	`+`
	`3446`	`+ Parameters`
	`3447`	`+ ----------`
	`3448`	`+ A`
	`3449`	+ Data, must be of length `n_variables` or be a structured array or scalar
	`3450`	+ with `n_variables` fields.
`3445`	`3451`	`"""`
`3446`	`3452`	`withself.callbacks.blocked():`
`3447`	`3453`	`# Pause callbacks while we are updating so we only get`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ class BoundaryNorm(Normalize):`
`411`	`411`
`412`	`412`	`classNoNorm(Normalize): ...`
`413`	`413`
`414`		`-classMultiNorm(Normalize):`
	`414`	`+classMultiNorm(Norm):`
`415`	`415`	`# Here "type: ignore[override]" is used for functions with a return type`
`416`	`416`	`# that differs from the function in the base class.`
`417`	`417`	# i.e. where `MultiNorm` returns a tuple and Normalize returns a `float` etc.
`@@ -438,6 +438,9 @@ class MultiNorm(Normalize):`
`438`	`438`	`defclip(self,value:ArrayLike\|bool)->None: ...`
`439`	`439`	`def__call__(self,value:ArrayLike,clip:ArrayLike\|bool\|None= ...)->list: ...# type: ignore[override]`
`440`	`440`	`definverse(self,value:ArrayLike)->list: ...# type: ignore[override]`
	`441`	`+defautoscale(self,A:ArrayLike)->None: ...`
	`442`	`+defautoscale_None(self,A:ArrayLike)->None: ...`
	`443`	`+defscaled(self)->bool: ...`
`441`	`444`
`442`	`445`	`defrgb_to_hsv(arr:ArrayLike)->np.ndarray: ...`
`443`	`446`	`defhsv_to_rgb(hsv:ArrayLike)->np.ndarray: ...`

Comments

(0)