Commitc0c64d6

authored

Merge pull request#7177 from ales-erjavec/scoring-warnings

[MNT] scoring: Fix numpy warnings

2 parents15e050a +07a7eb1 commitc0c64d6Copy full SHA for c0c64d6

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,20 @@ def compute_score(self, results):`
`114`	`114`
`115`	`115`	`@staticmethod`
`116`	`116`	`deffrom_predicted(results,score_function,**kwargs):`
	`117`	`+defas_scalar(e):`
	`118`	`+ifnp.isscalar(e):`
	`119`	`+returne`
	`120`	`+eliflen(e)==1:`
	`121`	`+returne[0]`
	`122`	`+else:`
	`123`	`+raiseValueError("len(e) > 1")`
	`124`	`+`
	`125`	`+scores= (score_function(results.actual,predicted,**kwargs)`
	`126`	`+forpredictedinresults.predicted)`
	`127`	`+# np.fromiter needs flat iter of scalars, some scoring function calls`
	`128`	`+# return array of single element`
`117`	`129`	`returnnp.fromiter(`
`118`		`- (score_function(results.actual,predicted,**kwargs)`
`119`		`-forpredictedinresults.predicted),`
	`130`	`+map(as_scalar,scores),`
`120`	`131`	`dtype=np.float64,count=len(results.predicted))`
`121`	`132`
`122`	`133`	`@staticmethod`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2166,6 +2166,10 @@ evaluation/scoring.py:`
`2166`	`2166`	`abstract: false`
`2167`	`2167`	`name: false`
`2168`	`2168`	`long_name: false`
	`2169`	+ class `Score`:
	`2170`	+ def `from_predicted`:
	`2171`	+ def `as_scalar`:
	`2172`	`+ len(e) > 1: false`
`2169`	`2173`	class `CA`:
`2170`	`2174`	`CA: Točnost`
`2171`	`2175`	`Classification accuracy: Klasifikacijska točnost`

Comments

(0)