From 17c2de36e2ec2f4f0941546f23cf069b193120c0 Mon Sep 17 00:00:00 2001 From: tarepan Date: Fri, 24 May 2024 18:49:54 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A9=B1=E9=80=9F=E9=81=A9=E7=94=A8?= =?UTF-8?q?=E3=82=92=E7=84=A1=E9=9F=B3=E8=B2=A0=E8=8D=B7=E3=81=AE=E5=89=8D?= =?UTF-8?q?=E3=81=B8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test_mocked_synthesize_wave_output.json | 7168 +++++++++++++++++ test/tts_pipeline/test_wave_synthesizer.py | 19 +- voicevox_engine/tts_pipeline/tts_engine.py | 2 +- 3 files changed, 7180 insertions(+), 9 deletions(-) diff --git a/test/tts_pipeline/__snapshots__/test_tts_engine/test_mocked_synthesize_wave_output.json b/test/tts_pipeline/__snapshots__/test_tts_engine/test_mocked_synthesize_wave_output.json index 22caa02ba..212c461ca 100644 --- a/test/tts_pipeline/__snapshots__/test_tts_engine/test_mocked_synthesize_wave_output.json +++ b/test/tts_pipeline/__snapshots__/test_tts_engine/test_mocked_synthesize_wave_output.json @@ -7088,6 +7088,7174 @@ 1.3, 1.3 ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], + [ + 1.3, + 1.3 + ], [ 1.31, 1.31 diff --git a/test/tts_pipeline/test_wave_synthesizer.py b/test/tts_pipeline/test_wave_synthesizer.py index fdddb2f6b..54632f406 100644 --- a/test/tts_pipeline/test_wave_synthesizer.py +++ b/test/tts_pipeline/test_wave_synthesizer.py @@ -274,23 +274,26 @@ def test_query_to_decoder_feature() -> None: # Expects # frame_per_phoneme # Pre k o N pau h i h O Pst - true_frame_per_phoneme = [1, 1, 2, 2, 1, 1, 2, 2, 1, 3] + true_frame_per_phoneme = [2, 1, 2, 2, 1, 1, 2, 2, 1, 6] n_frame = sum(true_frame_per_phoneme) # phoneme - # Pr k o o N N pau h i i h h O Pt Pt Pt - frame_phoneme_idxs = [0, 23, 30, 30, 4, 4, 0, 19, 21, 21, 19, 19, 5, 0, 0, 0] + # Pr Pr k o o N N pau] + frame_phoneme_idxs = [0, 0, 23, 30, 30, 4, 4, 0] + # h i i h h O Pt Pt Pt Pt Pt Pt + frame_phoneme_idxs += [19, 21, 21, 19, 19, 5, 0, 0, 0, 0, 0, 0] + true_phoneme = np.zeros([n_frame, TRUE_NUM_PHONEME], dtype=np.float32) for frame_idx, phoneme_idx in enumerate(frame_phoneme_idxs): true_phoneme[frame_idx, phoneme_idx] = 1.0 # Pitch # paw ko N pau hi hO paw - # frame_per_vowel = [1, 3, 2, 1, 3, 3, 3] - # pau ko ko ko N N - true1_f0 = [0.0, 250.0, 250.0, 250.0, 250.0, 250.0] + # frame_per_vowel = [2, 3, 2, 1, 3, 3, 6] + # pau pau ko ko ko N N + true1_f0 = [0.0, 0.0, 250.0, 250.0, 250.0, 250.0, 250.0] # pau hi hi hi true2_f0 = [0.0, 400.0, 400.0, 400.0] - # hO hO hO paw paw paw - true3_f0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0] + # hO hO hO paw paw paw paw paw paw + true3_f0 = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0] true_f0 = np.array(true1_f0 + true2_f0 + true3_f0, dtype=np.float32) # Outputs diff --git a/voicevox_engine/tts_pipeline/tts_engine.py b/voicevox_engine/tts_pipeline/tts_engine.py index cc35cf5ae..cadcc28fd 100644 --- a/voicevox_engine/tts_pipeline/tts_engine.py +++ b/voicevox_engine/tts_pipeline/tts_engine.py @@ -219,8 +219,8 @@ def query_to_decoder_feature( moras = to_flatten_moras(query.accent_phrases) # 設定を適用する - moras = apply_prepost_silence(moras, query) moras = apply_speed_scale(moras, query) + moras = apply_prepost_silence(moras, query) moras = apply_pitch_scale(moras, query) moras = apply_intonation_scale(moras, query) From 8b76a8490d65d7f417bbd9f9368dac1726376c40 Mon Sep 17 00:00:00 2001 From: tarepan Date: Fri, 24 May 2024 18:50:26 +0000 Subject: [PATCH 2/2] fix: lint --- test/tts_pipeline/test_wave_synthesizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tts_pipeline/test_wave_synthesizer.py b/test/tts_pipeline/test_wave_synthesizer.py index 54632f406..6265c929a 100644 --- a/test/tts_pipeline/test_wave_synthesizer.py +++ b/test/tts_pipeline/test_wave_synthesizer.py @@ -281,7 +281,7 @@ def test_query_to_decoder_feature() -> None: frame_phoneme_idxs = [0, 0, 23, 30, 30, 4, 4, 0] # h i i h h O Pt Pt Pt Pt Pt Pt frame_phoneme_idxs += [19, 21, 21, 19, 19, 5, 0, 0, 0, 0, 0, 0] - + true_phoneme = np.zeros([n_frame, TRUE_NUM_PHONEME], dtype=np.float32) for frame_idx, phoneme_idx in enumerate(frame_phoneme_idxs): true_phoneme[frame_idx, phoneme_idx] = 1.0