models_test: VariationModel input locations should be in normalized space

not only base should be at 0, but min/max respectively at -1.0 and +1.0.
that's how varLib constructs models internally, so update test case to reflect that
This commit is contained in:
Cosimo Lupo 2019-03-04 12:31:08 -08:00
parent 05824b8616
commit 0811834b3c

View File

@ -43,38 +43,38 @@ class VariationModelTest(object):
[ [
( (
[ [
{'wght':100}, {'wght': 0.55},
{'wght':-100}, {'wght': -0.55},
{'wght':-180}, {'wght': -1.0},
{'wdth':+.3}, {'wdth': 1.0},
{'wght':+120,'wdth':.3}, {'wght': 0.66, 'wdth': 1.0},
{'wght':+120,'wdth':.2}, {'wght': 0.66, 'wdth': 0.66},
{}, {},
{'wght':+180,'wdth':.3}, {'wght': 1.0, 'wdth': 1.0},
{'wght':+180}, {'wght': 1.0},
], ],
["wght"], ["wght"],
[ [
{}, {},
{'wght': -100}, {'wght': -0.55},
{'wght': -180}, {'wght': -1.0},
{'wght': 100}, {'wght': 0.55},
{'wght': 180}, {'wght': 1.0},
{'wdth': 0.3}, {'wdth': 1.0},
{'wdth': 0.3, 'wght': 180}, {'wdth': 1.0, 'wght': 1.0},
{'wdth': 0.3, 'wght': 120}, {'wdth': 1.0, 'wght': 0.66},
{'wdth': 0.2, 'wght': 120} {'wdth': 0.66, 'wght': 0.66}
], ],
[ [
{}, {},
{'wght': (-180, -100, 0)}, {'wght': (-1.0, -0.55, 0)},
{'wght': (-180, -180, -100)}, {'wght': (-1.0, -1.0, -0.55)},
{'wght': (0, 100, 180)}, {'wght': (0, 0.55, 1.0)},
{'wght': (100, 180, 180)}, {'wght': (0.55, 1.0, 1.0)},
{'wdth': (0, 0.3, 0.3)}, {'wdth': (0, 1.0, 1.0)},
{'wdth': (0, 0.3, 0.3), 'wght': (0, 180, 180)}, {'wdth': (0, 1.0, 1.0), 'wght': (0, 1.0, 1.0)},
{'wdth': (0, 0.3, 0.3), 'wght': (0, 120, 180)}, {'wdth': (0, 1.0, 1.0), 'wght': (0, 0.66, 1.0)},
{'wdth': (0, 0.2, 0.3), 'wght': (0, 120, 180)} {'wdth': (0, 0.66, 1.0), 'wght': (0, 0.66, 1.0)}
], ],
[ [
{}, {},
@ -83,14 +83,20 @@ class VariationModelTest(object):
{0: 1.0}, {0: 1.0},
{0: 1.0}, {0: 1.0},
{0: 1.0}, {0: 1.0},
{0: 1.0, 4: 1.0, 5: 1.0},
{0: 1.0, 3: 0.75, 4: 0.25, 5: 1.0, 6: 0.6666666666666666},
{0: 1.0, {0: 1.0,
3: 0.75, 4: 1.0,
4: 0.25, 5: 1.0},
5: 0.6666666666666667, {0: 1.0,
6: 0.4444444444444445, 3: 0.7555555555555555,
7: 0.6666666666666667} 4: 0.24444444444444444,
5: 1.0,
6: 0.66},
{0: 1.0,
3: 0.7555555555555555,
4: 0.24444444444444444,
5: 0.66,
6: 0.43560000000000006,
7: 0.66}
] ]
), ),
( (