From 0457a026200fc4784e1e7d6beaf6bff495474d1d Mon Sep 17 00:00:00 2001 From: RexBearIU Date: Mon, 22 Apr 2024 10:10:29 +0800 Subject: [PATCH] fix:unittest --- package.json | 2 +- src/price_ticker/price_ticker.controller.spec.ts | 2 +- src/price_ticker/price_ticker.service.spec.ts | 6 +++--- src/strategies/etharr.txt | 2 +- .../strategy/rl-dqn/reinforcement-Learning.spec.ts | 7 ++++++- src/strategies/strategy/rl-dqn/train.ts | 10 +++++----- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 05c270a..23047db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "auto-trade", - "version": "0.0.1+4", + "version": "0.0.1+5", "description": "", "author": "", "private": true, diff --git a/src/price_ticker/price_ticker.controller.spec.ts b/src/price_ticker/price_ticker.controller.spec.ts index b67273c..780af2b 100644 --- a/src/price_ticker/price_ticker.controller.spec.ts +++ b/src/price_ticker/price_ticker.controller.spec.ts @@ -1,6 +1,6 @@ import { Test, TestingModule } from '@nestjs/testing'; import { PriceTickerController } from './price_ticker.controller'; -import PriceTickerService from './price_ticker.service'; +import { PriceTickerService } from './price_ticker.service'; import { HttpModule } from '@nestjs/axios'; describe('PriceTickerController', () => { diff --git a/src/price_ticker/price_ticker.service.spec.ts b/src/price_ticker/price_ticker.service.spec.ts index 0b9f48a..7bbae7a 100644 --- a/src/price_ticker/price_ticker.service.spec.ts +++ b/src/price_ticker/price_ticker.service.spec.ts @@ -26,8 +26,8 @@ describe('PriceTickerService', () => { it('should return an array of tickers', async () => { const array = [1, 2, 3, 4, 5]; - jest.spyOn(service, 'getTickers').mockImplementation(async () => array); - expect(await service.getTickers()).toStrictEqual([1, 2, 3, 4, 5]); + jest.spyOn(service, 'fetchTickers').mockImplementation(async () => array); + expect(await service.fetchTickers()).toStrictEqual([1, 2, 3, 4, 5]); }); it('should return an array of candlestick', async () => { @@ -43,7 +43,7 @@ describe('PriceTickerService', () => { for (let i = 0; i < 11; i++) { const begin = Date.now() - 90000000 * (i + 1); const end = Date.now() - 90000000 * i; - const r = await service.getCandlesticksV2('ETH-USDT', '5m', begin, end); + const r = await service.fetchCandlesticksV2('ETH-USDT', '5m', begin, end); const tempArr = r.data.candlesticks.candlesticks.map( (item) => item.y.close, ); diff --git a/src/strategies/etharr.txt b/src/strategies/etharr.txt index 8e3472b..b018302 100644 --- a/src/strategies/etharr.txt +++ b/src/strategies/etharr.txt @@ -1 +1 @@ -[3494.09,3493.24,3497.76,3500.59,3506.89,3514.41,3515.39,3513.18,3515.79,3518.16,3522.4,3519.81,3520.57,3516.58,3514.56,3518.77,3520.61,3517.79,3516.21,3515.51,3514.86,3512.56,3509.87,3507.6,3510.01,3509.21,3506.13,3504.41,3505.8,3505.61,3506.38,3511.27,3509.31,3511.72,3513.97,3510,3509.8,3514.8,3520.07,3518.69,3519.72,3517.75,3515.75,3514.01,3512.25,3510.42,3511.4,3510,3508.62,3507.07,3503.01,3503.66,3506.61,3506.8,3507.41,3508.21,3504.65,3505.79,3506.59,3506.95,3509.11,3508.02,3495.57,3493.25,3496.12,3499.02,3492.13,3491.31,3490.04,3487.81,3489.46,3488.8,3493.59,3491.81,3497,3495.42,3493.68,3497.01,3497.16,3498.99,3502.76,3505.99,3506.39,3516.42,3523.26,3518.42,3522.16,3519.76,3508,3509.46,3511.81,3513.83,3512.99,3509.7,3508.01,3501.08,3494.59,3500.3,3505.79,3503.3,3505.42,3496.09,3496.28,3498.43,3502.61,3502.26,3499.79,3502.72,3499.66,3503.01,3501.82,3498.79,3498.68,3500.77,3497.77,3500.53,3498.79,3497.99,3492.25,3496.09,3497.16,3501.8,3503,3503.66,3505.26,3502.77,3503.21,3498,3494.48,3503.93,3505.09,3502.79,3505.41,3504.07,3510.01,3509,3507.96,3509.93,3509.15,3513.19,3510.88,3510.59,3515,3511.98,3511.41,3511.76,3512.9,3513.31,3516,3518.91,3527.2,3521.99,3523.1,3526.66,3526.49,3532.41,3529,3528.04,3536.2,3538.87,3542.02,3548.01,3557.44,3553.01,3550.79,3556.21,3560.23,3556.56,3554.6,3553.67,3556.24,3550.8,3550,3549.18,3549.81,3553.29,3555.01,3551.2,3551.98,3545.94,3546.59,3540,3545.97,3542.01,3540.1,3535.4,3540.21,3541.1,3541.38,3543.03,3543.68,3545.61,3539.43,3538.19,3541.69,3541.11,3540.61,3542.35,3542.28,3537,3532,3535.39,3534.56,3540.05,3544.59,3543.92,3543.01,3538.74,3538.24,3536.17,3537.15,3536.51,3534.57,3535.41,3536.2,3536.99,3535.52,3532.56,3528.58,3531.4,3531.68,3537.79,3533.81,3529.13,3543.08,3545,3542.31,3538.09,3536.36,3530.79,3527.28,3527.34,3529.58,3527.61,3528.2,3529.64,3526.23,3530.05,3532.4,3529.54,3523.2,3522.18,3522.8,3528.33,3529.6,3527.4,3526.8,3525.82,3525.72,3523.8,3522.42,3508.89,3502.72,3494.73,3493,3502.7,3505,3504.96,3501.69,3503.97,3504.79,3508.63,3508.85,3505.76,3504.79,3507.59,3510.21,3507.71,3510.23,3507.98,3511.38,3508.78,3508.93,3509.05,3506.37,3509.58,3503.48,3498.4,3503.8,3503.99,3502.75,3502.58,3502.71,3508.03,3507.02,3505.18,3504.43,3506.29,3503.55,3505.6,3511.74,3516.28,3513.19,3510.91,3506.81,3504.2,3509.01,3504.59,3506.55,3509.5,3508.48,3507.01,3507.43,3505.01,3496.39,3502.21,3503.52,3502.22,3506.79,3508.99,3505.97,3505.65,3508.97,3511.83,3515.01,3516.06,3514,3516.37,3517.24,3517.63,3518.03,3516.79,3518.36,3521.33,3527.8,3524.53,3522.38,3520.61,3519.6,3523.78,3521.11,3522.41,3521.74,3524.77,3523.65,3521.6,3524.9,3540.21,3534,3533.28,3541.62,3534.81,3533.92,3534.23,3531,3532.54,3532.04,3532.76,3531.38,3528.55,3527.9,3532.45,3534.08,3534.43,3538.85,3536.16,3535,3537.02,3536.74,3533,3534.28,3536.95,3534.93,3534.37,3541.78,3542.21,3543.33,3546.39,3542.01,3543.05,3542.89,3544.61,3543.33,3566.81,3566.99,3587.2,3587.6,3582.75,3587.18,3591.26,3600.62,3599.2,3604.36,3615.43,3615.26,3610,3614.08,3614.32,3617.79,3622.6,3623.01,3620.83,3616,3622,3615.85,3619.79,3621.79,3615.99,3617.82,3616.05,3613.6,3617.77,3622,3624.6,3625.15,3623.6,3624.99,3628.26,3625.01,3628.06,3624.39,3626.79,3628.5,3630.97,3626.62,3622.29,3615.99,3615.55,3617.57,3614.78,3611.59,3613.21,3607.85,3607.79,3609.46,3607.49,3609.22,3612,3607.46,3605.35,3601.45,3603.38,3603.01,3605.61,3605.83,3605.15,3605.89,3604.51,3602.51,3607.19,3607.01,3605.2,3604.01,3608.29,3607.29,3610.17,3608.99,3601.61,3603.45,3600.79,3603,3606.4,3603.76,3609,3608.33,3611.79,3611.82,3619.5,3609.6,3611.31,3612.78,3614.86,3613.99,3609.92,3614.22,3613.91,3615.76,3620.21,3621.28,3626.76,3622.84,3622.61,3622.4,3620.38,3622.72,3622.24,3627.07,3625.96,3623.8,3619.42,3621.58,3624.3,3626.41,3626.43,3634.98,3630.32,3626.39,3626.55,3623.66,3622.81,3622.83,3621.79,3621.77,3620,3620.74,3615.39,3614.4,3616.02,3617.87,3619.39,3619.82,3618.01,3617.28,3621.76,3622.02,3628.6,3633.3,3625.71,3625.36,3627.08,3624.19,3623.87,3624.86,3620.39,3621.35,3621.19,3622.45,3624.07,3623.69,3623.05,3622.35,3622.61,3623.73,3627.41,3626.6,3627.49,3626.54,3625.17,3623.34,3626.4,3626.54,3624,3626.68,3629.93,3647.22,3646.56,3651.48,3644.46,3629.41,3617.22,3631.96,3633.59,3636.51,3640.85,3638.22,3636.05,3634.36,3643.19,3640.29,3640.2,3638.39,3642.75,3640.03,3641.6,3641.02,3636.67,3635.61,3634.24,3635.82,3630.24,3637.24,3636.03,3632.97,3632.45,3635.99,3638.67,3633.58,3635.01,3632.99,3633.8,3628.88,3624.5,3620.01,3625.8,3625.19,3634.81,3634.31,3632.42,3630.64,3637.07,3634.83,3636.03,3631.01,3630.64,3629.01,3628.61,3629.8,3630.19,3637.4,3638.82,3641.57,3648.83,3644.01,3647.94,3649.23,3646.23,3642.56,3644.58,3645.39,3643.61,3641.34,3636.03,3638.63,3637.07,3633.37,3630.15,3625.59,3620.72,3622.18,3620.21,3626.08,3624.4,3622,3621.01,3616,3616.86,3612.27,3619.03,3609.59,3610.39,3612,3609.38,3609.65,3609.41,3610.02,3610.8,3610.67,3608.24,3609.01,3606.4,3612.27,3611.82,3613.72,3614.6,3613.6,3614.62,3608,3607,3609.96,3610.89,3602.86,3603.82,3601.83,3606,3615.83,3613.18,3610.6,3612.01,3612.8,3610.46,3608,3604.61,3608.38,3607.62,3609.33,3605.4,3606.21,3605.13,3600.38,3605.38,3599.25,3598.8,3596.97,3595.03,3591.4,3581.3,3574.59,3570.46,3530.82,3515.43,3510.17,3522.1,3524.59,3525,3528.44,3533.66,3532.72,3538.01,3544.95,3546.6,3544.99,3544.14,3542,3546.66,3550.01,3548.41,3545.78,3546.33,3550.49,3547.3,3546.35,3545.41,3546.2,3550.67,3546.49,3542,3535.26,3534.84,3533.41,3525.44,3530.4,3536.2,3537.6,3539.76,3535.47,3536.6,3534.11,3539.56,3545.99,3549.78,3546.77,3546.94,3545.54,3545.21,3543.6,3540.4,3546.11,3542.22,3540.01,3539.58,3541.84,3543.66,3540.8,3532.71,3532.57,3535,3542.14,3539.59,3543.39,3545.39,3546.41,3553.88,3549.6,3555.81,3552.41,3551.34,3548.3,3543.49,3541.71,3540.65,3536.51,3538.48,3538.01,3539.79,3543.96,3545.81,3551.14,3555.47,3552.53,3552.12,3550,3554.89,3556,3556.25,3557.82,3554.41,3557.54,3555.41,3549.11,3550.6,3563.19,3558.09,3568.8,3564.24,3563.19,3555,3555.4,3546.25,3545.59,3542.74,3543.27,3540.67,3532.45,3527.79,3519.21,3515.68,3519.08,3507.26,3508.82,3505.24,3464.62,3468.8,3473.25,3481.39,3489.2,3482.75,3479.21,3478.97,3480.94,3460.91,3443.78,3450.76,3456.81,3457.8,3452.08,3457.69,3461,3453.34,3447.67,3452.63,3454.83,3458.82,3445.45,3440.51,3439.41,3442.04,3444.75,3434.08,3437.58,3439.54,3426.6,3435.72,3433.88,3438.71,3442.49,3429.13,3421.59,3427.41,3432.15,3435.4,3437.65,3439.13,3434.21,3433.62,3438.16,3446.44,3446.72,3447.05,3452.82,3454.73,3465.79,3475.19,3468.99,3469.62,3466.65,3472.92,3474.6,3481.19,3486.2,3482.17,3478.48,3476.61,3473.89,3471.8,3477.74,3477.55,3480.6,3484,3482.17,3492.6,3496.21,3486.78,3490.42,3500.01,3495.43,3499,3499.41,3497.41,3495.19,3492.34,3488.38,3492.16,3493.37,3497.62,3495.41,3498.02,3498.59,3495.48,3499.8,3502.37,3501.02,3509.32,3512.41,3503.76,3504.33,3505.88,3509.54,3512.96,3510.01,3510.26,3510.38,3514.01,3509.51,3509.8,3511.76,3504.24,3504.19,3504.79,3501.07,3502.98,3493.41,3494.34,3495.31,3481.51,3476.59,3478.67,3486.82,3490.01,3487.44,3494.57,3497.98,3499.81,3496.02,3493.72,3493.95,3491.21,3496.8,3496.98,3490.62,3493.71,3493.8,3486.98,3482.18,3483.21,3480.75,3472.21,3441.73,3433.6,3335.28,3352.28,3360.99,3366.52,3366.6,3372.74,3369.65,3372.26,3365,3361.01,3365.81,3367.01,3370.6,3361.11,3364.98,3364.6,3366.02,3371.8,3362.95,3357.24,3351.79,3360.74,3367.47,3367.64,3376.33,3374.18,3368.09,3361.99,3362.81,3363.21,3360.22,3356.17,3346.53,3346.59,3352.41,3349.62,3350.44,3358.69,3360.55,3364.39,3369.07,3371.99,3369.98,3371.83,3375.45,3370.8,3374.21,3375.03,3378.8,3385.2,3385.22,3383.92,3382.22,3384.28,3380.87,3379.66,3382.33,3384.25,3384.39,3385.74,3377.93,3372.41,3369.54,3367.27,3362.95,3361.65,3365.29,3357.08,3357.37,3357.8,3366,3363.03,3358.51,3353.26,3352,3336.51,3335.03,3318.6,3328.1,3339.43,3345.7,3345.61,3341.85,3339.35,3336.35,3343.01,3352.4,3349.08,3345,3336.6,3338,3330.47,3343.41,3343.14,3342.4,3335.59,3328.55,3325.01,3320.6,3324.41,3328.2,3325.05,3310.19,3308.59,3298.8,3294.88,3285.74,3298.08,3287.93,3299.2,3308.38,3307.4,3308.59,3303.47,3314.6,3315.37,3319.55,3322.42,3324.01,3320.11,3316.77,3312.98,3307.78,3297.79,3296.76,3284.89,3288.42,3300.29,3293.79,3264.51,3265.79,3255.38,3250.92,3258.21,3267.4,3271.4,3270.82,3281.18,3287.66,3292.25,3300.4,3297.79,3305.42,3314.46,3306.7,3312.42,3302,3298.39,3293.37,3297.81,3307.4,3300.64,3293.26,3294.6,3292.15,3284.6,3264.6,3273.95,3261.79,3245.34,3240.1,3224.63,3235.5,3250.57,3236.19,3229.65,3247.25,3255.72,3258.79,3245.66,3265.7,3266.16,3261.4,3264.81,3267.47,3260.22,3259.77,3248.56,3253.93,3255.24,3260.33,3259.3,3250.82,3252.7,3269.2,3261.36,3259.13,3264.71,3270.06,3273.85,3267.39,3267.25,3264.1,3267.79,3280.61,3276.73,3274.49,3277.91,3278.57,3277.8,3266.05,3269.81,3271.39,3275.75,3276.6,3281,3274.34,3271.63,3276.98,3276.13,3285.07,3291.5,3287.01,3282.32,3286.27,3277.46,3274.07,3273.51,3269.23,3276.26,3270.01,3269.22,3262.31,3267.59,3265.7,3260.81,3255.41,3254.53,3267.69,3268.75,3261.64,3263.2,3266.59,3262.55,3266.92,3271.79,3267.4,3272.79,3273.79,3281.68,3280.89,3287.13,3294.4,3302.03,3298.72,3294.23,3291.7,3293.07,3296.61,3294.83,3290.82,3281.7,3277.2,3279.71,3278.13,3274.36,3278.95,3278.83,3286.8,3276.67,3286.01,3271.61,3253.3,3238.39,3216.79,3239.8,3256.81,3262.03,3278.4,3266.83,3263.31,3267.68,3277.47,3267,3275.63,3281.62,3286.37,3282.74,3288.97,3290,3296.94,3301.58,3306.65,3297.03,3295.53,3306.1,3304.41,3299.81,3300.39,3301.27,3304.27,3304.72,3306.96,3298.5,3297.01,3301.41,3314.51,3308.4,3304.44,3308.01,3312.8,3314.89,3314.42,3318.31,3315.8,3312.79,3319.2,3311,3312.46,3314,3318.01,3314.42,3317.99,3313.2,3315.72,3315.45,3315.14,3313.75,3312.25,3311.22,3306.63,3310.53,3311.15,3305.94,3303.26,3301.44,3294.46,3288.4,3293.18,3304.83,3306.73,3304.01,3303.38,3311.97,3310.52,3306.8,3304.2,3304.65,3306.56,3308.76,3310.4,3301.6,3304.21,3318.61,3318.99,3309.14,3310.34,3308.13,3310.83,3312.62,3308.6,3307.2,3305.59,3299.28,3294,3293.99,3302.77,3305,3309.25,3330.01,3348.81,3351.55,3346.16,3341.88,3344.06,3353.69,3348.42,3333.38,3334.41,3332.43,3331.6,3341.8,3339.49,3338.4,3344.99,3349.67,3346.78,3341.26,3340.57,3337.99,3340,3337.22,3330.4,3323.41,3329.6,3315.19,3315.43,3315.78,3319.2,3308.02,3292.75,3300,3301.31,3305.4,3306.57,3310.49,3311.13,3310.58,3303.71,3326.38,3317.98,3312.49,3320.39,3323.29,3318.2,3319,3313.07,3307.79,3305.37,3307.77,3305,3309.54,3310.01,3316.19,3315.42,3311.31,3301.71,3295.34,3301.05,3311.01,3309.81,3304.89,3311.59,3313,3311.98,3347.24,3348.96,3358.68,3345.61,3350,3356.2,3355.81,3351.95,3347.08,3349.37,3352.63,3357.82,3354.76,3346.21,3349.18,3348.04,3343.73,3340.57,3319.52,3320.5,3325,3333.2,3330.74,3328.61,3343.99,3345.89,3346.02,3354.51,3354.01,3354.22,3359.77,3348.01,3356.81,3353.41,3352.99,3349.27,3342.15,3349.21,3345.23,3341,3339.26,3328.82,3314.6,3316.74,3325.38,3325.87,3326.6,3324.76,3320.53,3309.6,3308.81,3306.21,3287.79,3289.38,3294.6,3300.06,3308.79,3316.62,3333.23,3334.4,3330.55,3318.64,3314.58,3316.52,3315.65,3318.83,3319.85,3318.34,3318.72,3320.26,3315.29,3314.41,3305.77,3302.51,3308.28,3305.8,3307.21,3304.18,3295.75,3297.71,3295.2,3303.67,3305.02,3305.81,3294.21,3294.54,3297.99,3298.88,3298.25,3297.99,3307.29,3302.88,3300.86,3303.15,3314,3317.36,3319.41,3318.39,3319.62,3314.59,3315.79,3318.47,3312.4,3314.22,3314.59,3315.22,3318.07,3319.02,3321.14,3321.64,3323.2,3321.64,3318.82,3315.99,3317.27,3313.34,3319.3,3317.15,3316.16,3311.55,3310.48,3313.58,3320.59,3316.2,3323.2,3323.21,3323,3317.02,3327.88,3330.4,3326.67,3328.19,3322.3,3323,3331.41,3330.29,3331.19,3326.77,3326.6,3320,3321.45,3317.01,3319.02,3321.22,3317.64,3314,3314.76,3305.55,3301.69,3275.74,3280.94,3280,3277.2,3278.42,3281.37,3274.87,3275.58,3264.59,3269.61,3279.12,3279.79,3275.44,3282.6,3276.13,3278.4,3281.73,3280.95,3275.1,3271.64,3266.97,3266.17,3259.91,3255.39,3266.82,3277.4,3287.27,3284.74,3286.44,3288,3288.32,3285.38,3289.2,3293.43,3286.6,3288.32,3286.62,3286.28,3290.19,3292.36,3294.42,3294.6,3296.24,3297.7,3304.79,3307.66,3306.01,3300.32,3303.07,3305.41,3310,3309.59,3308.28,3308.57,3311.2,3304.84,3310.99,3330.21,3330.19,3327.29,3330.16,3327.82,3330.49,3327.6,3319.99,3320.53,3323.58,3326.11,3326.79,3336.39,3335.99,3333.55,3329.05,3326.59,3328.72,3329.6,3331.42,3332.95,3332.58,3340.89,3336.18,3333.79,3331.22,3330.52,3335.47,3333.56,3337.38,3336.7,3337.38,3335.49,3338.81,3338.82,3331.91,3333.4,3340.52,3353.54,3347.81,3344.34,3343.02,3345.35,3345.59,3344.53,3341.38,3341,3339.81,3335.08,3337.58,3340.57,3341.32,3343.76,3344.78,3348,3345.99,3343.99,3340.39,3340.01,3343.3,3347.94,3343.72,3349.06,3347.94,3345.6,3349.77,3350.99,3353.54,3347.6,3347.4,3353.17,3355.81,3361.59,3373.4,3371.2,3364.68,3363.73,3366.44,3372.46,3371.53,3372.11,3366.08,3362.6,3378.83,3377.57,3375.81,3369.23,3368.78,3375.33,3377.21,3386.64,3390.68,3387.27,3381.27,3378.02,3378.32,3379.84,3378.67,3373.01,3377.32,3372.6,3369.22,3370.84,3370.41,3365.18,3364.1,3360.83,3368.09,3372.68,3376.03,3386.11,3379.11,3378.87,3375.22,3375.21,3381.16,3380,3375.21,3377.82,3376.23,3377.38,3375.88,3378.24,3377.15,3382.4,3385.59,3382.37,3391.98,3413.28,3412.85,3436.41,3422,3414.69,3417.98,3414.29,3405.92,3389.18,3395.98,3393.37,3392.41,3383.63,3379.53,3374.67,3373.15,3371.37,3366.07,3373.19,3373.96,3382.1,3378.58,3372.74,3373.56,3374.18,3366.4,3340.83,3306.38,3303.5,3289.99,3282.81,3309.88,3332.8,3320.23,3323.38,3319.69,3324.85,3325.61,3334.49,3326.8,3333,3327.59,3328.21,3332.85,3325.01,3312.38,3313.14,3313.56,3322.85,3321.79,3318.36,3310.79,3316.42,3324.41,3327.02,3325.41,3326.69,3328,3322.11,3318.4,3312,3313.21,3315.4,3320,3329.61,3327.59,3323.76,3321.83,3322.79,3328.6,3328.91,3326.82,3327.59,3328.2,3318.76,3320.26,3321.18,3318.4,3318.98,3312.54,3316.94,3309.04,3314.16,3317.46,3329.89,3329.21,3323.79,3322.34,3321.23,3318.61,3300.6,3303.13,3295.51,3292.56,3304.96,3303.19,3303.45,3300.2,3290.83,3287,3293.53,3285.41,3289.79,3286.85,3283.4,3264.49,3262.06,3266.49,3269,3267.99,3273.45,3280.55,3282.41,3285.06,3290.66,3293.49,3293.71,3296.24,3299.8,3299.4,3309.01,3308.07,3308.38,3313.85,3318.19,3309.91,3304.59,3303.02,3297.99,3290.59,3280.2,3286.03,3297.5,3296.01,3292.8,3282.81,3276.43,3260.54,3250.98,3258,3263.82,3265.38,3271.91,3276.02,3273.79,3273.63,3272.24,3277.27,3279.5,3277.22,3282.4,3286.79,3289.6,3286.01,3285.04,3278.51,3282.68,3288.58,3283.2,3280.41,3285.78,3284.19,3285,3287.33,3281.79,3286.93,3284.73,3285.79,3285.2,3287.45,3286.4,3289.34,3293.53,3290.03,3310.8,3300.65,3298.7,3285.42,3287.62,3287.78,3281.77,3284.92,3279.63,3269.4,3277.14,3269.53,3258.39,3267.2,3268,3267.13,3270.9,3273.51,3275.93,3274.8999999999996,3273.87,3274.5,3282.27,3276.21,3268.18,3264.25,3260.13,3275.85,3279.7,3278.8,3272.9,3270.835,3268.77,3270.59,3270.71,3272.39,3270.01,3263.8,3258.19,3263.48,3263.5,3255.65,3248.1,3235.55,3223,3236.29,3239.59,3244.01,3244.6,3251.78,3230.21,3222.03,3238.01,3243.38,3255.01,3250.74,3246.47,3239.62,3246.04,3244.75,3249.4,3258.22,3271.01,3263.91,3276.2,3284.19,3284.54,3282.46,3280.38,3285.99,3307.82,3303.29,3295,3289.85,3293.12,3302.61,3313.37,3328.8,3321.6,3315.0550000000003,3308.51,3312.99,3317.53,3305.01,3303.33,3307.35,3306.91,3318.42,3323.21,3313.96,3318.19,3325.94,3333.69,3320.07,3315.59,3318.6,3320.73,3321.2,3320.99,3319.3,3321.96,3320.19,3318.2,3319.1,3320,3309.7,3315.41,3319.33,3325.97,3322.39,3329.26,3324.25,3320.19,3315.11,3318,3314.065,3310.13,3320,3321.96,3321.71,3332.01,3322.18,3326.98,3331.22,3324.97,3328.22,3326.05,3331.3050000000003,3336.56,3337.86,3329.93,3336.16,3331.06,3332.19,3335.44,3336.76,3327.07,3330.22,3325.8,3322.045,3318.29,3325.86,3327.81,3321.89,3325.86,3334.15,3340.25,3341.41,3335.39,3335.63,3335.6,3334.1099999999997,3332.62,3330.11,3330.42,3335.86,3339.15,3339.39,3332.61,3332.04,3331.44,3330.47,3323.33,3323.6549999999997,3323.98,3326.82,3324.4,3323.99,3326.2,3324.94,3322.2,3326.99,3326.34,3324.98,3320.82,3320.025,3319.23,3322.8,3327.21,3324.83,3323.62,3322.56,3323.74,3321.39,3323.75,3324.38,3322.33,3317.365,3312.4,3315.7,3316.78,3320.12,3317.4,3322.54,3326.4,3336.61,3331.19,3328.4,3332.52,3328.785,3325.05,3319.97,3320.99,3330.62,3328.36,3325.41,3326.6,3323.3,3325.2,3321.99,3317.81,3318.1949999999997,3318.58,3322.18,3318.3,3316.99,3320.81,3317.21,3314.4,3312.4,3320.99,3324.24,3320.8,3324.59,3328.38,3327.19,3328.96,3333.46,3341.21,3337.95,3332.89,3333.61,3328.81,3328.82,3330.39,3332.09,3333.79,3333.19,3330.56,3329.59,3327.12,3325.32,3324.18,3329.45,3324.99,3323.19,3331.87,3331.94,3332.01,3337.37,3341.2,3342.81,3337.6,3344.01,3343.82,3340.42,3340.41,3334.79,3338.01,3336.7,3335.39,3333.41,3336.08,3340.01,3335.5,3339.62,3343.68,3342.6,3342.67,3344.59,3344.79,3343.9,3343.01,3336.21,3335.57,3333.67,3330.26,3330.2,3330.64,3332.21,3330.19,3334.02,3333.81,3333.8050000000003,3333.8,3329.58,3331,3328.79,3329.53,3332.12,3329,3331.71,3333.35,3338.2,3341.59,3341.695,3341.8,3349.39,3348.2,3342.01,3340.38,3339.73,3333.4,3334.8,3335.38,3336.09,3335.39,3335.25,3335.11,3336.79,3341.27,3337.02,3338.19,3338.34,3331.79,3335.74,3337.77,3338.63,3337.49,3340.4449999999997,3343.4,3339.08,3335.8,3335.6,3334.42,3332.88,3331.95,3332.93,3333.8,3335.62,3333.6,3332.19,3330.78,3331.21,3331.83,3330.79,3334.72,3336.67,3333.12,3331.82,3326.5,3328.86,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.49,3331.825,3332.16,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3331.98,3333.4,3334.82,3336,3333.77,3334.19,3338.73,3333.43,3336.75,3333.67,3335.66,3336.81,3337.78,3335.8050000000003,3333.83,3335.61,3336.79,3339.12,3338.69,3338.19,3340.54,3340.38,3347,3343.63,3344.4,3343.7,3343,3343.9,3344,3343.25,3343.13,3347.1,3342.68,3337.96,3338.85,3342.81,3344.39,3346.45,3348.51,3353.7,3351.8,3351.55,3353.79,3350.24,3350.6,3348.05,3349.61,3348.4,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3348.49,3357.08,3365.67,3367.7,3367.31,3375.59,3385.07,3387.27,3381.2,3388.01,3386.8,3388.01,3388.61,3389.085,3389.56,3405.22,3395.72,3396.23,3396.98,3397.6,3390.22,3391.81,3393,3392.79,3383,3383.975,3384.95,3381.63,3382.9,3387.59,3387.02,3387.37,3386.81,3385.79,3387.79,3392.79,3390.6,3391.8999999999996,3393.2,3389.05,3382.61,3385.08,3381.75,3382.01,3376.4,3382.15,3383.71,3387.37,3388.09,3387.84,3387.59,3405.33,3395.67,3394.01,3394.01,3392.2,3392,3392.21,3392.85,3393.68,3394.29,3394.145,3394,3393.59,3395.58,3388.72,3387.3,3386.42,3386.58,3386.57,3387.58,3385.42,3381.8,3384.005,3386.21,3388.51,3386.6,3385,3391.85,3391.67,3390.4,3394.34,3389.61,3391,3387.28,3387.9700000000003,3388.66,3390.8,3391.36,3388.02,3387.43,3392.01,3389.68,3390,3393.4,3393.2,3392.59,3390.945,3389.3,3389.55,3393.61,3390.32,3388,3387.42,3384.44,3379.99,3381.68,3379.41,3382.13,3380.565,3379,3383.32,3383.72,3387.32,3389.4,3388.7,3387.83,3390.61,3392.67,3391.55,3391.25,3390.1,3388.95,3386.1,3387.44,3385.08,3388.96,3390.67,3387.94,3388.87,3392.61,3390.31,3389.83,3389.785,3389.74,3386.99,3386.38,3386.6,3386.52,3385.38,3387.05,3391.7,3400.52,3392.77,3405.8,3401.945,3398.09,3403.8,3409.4,3405.41,3412.2,3408.82,3402.72,3412.48,3407.19,3406.19,3409.48,3406.475,3403.47,3404.98,3400.18,3398.67,3399.22,3398.68,3399.24,3403.33,3405.6,3401.38,3410.81,3408.425,3406.04,3409.8,3415,3413.41,3412.81,3409.1,3400.3,3391.36,3395.42,3388.4,3400.86,3396.645,3392.43,3398.2,3399.41,3407.21,3404,3401.21,3406.35,3408.6,3404.19,3400.02,3403.21,3396.495,3389.78,3382.13,3385.05,3388.8,3387.2,3385.49,3381.28,3380.02,3382.91,3383.41,3383.99,3381.585,3379.18,3376.67,3376.55,3380.2,3382.74,3381.71,3378.7,3372.63,3379.69,3380.09,3380.72,3380.375,3380.03,3379.75,3384.8,3382.94,3391.61,3390.36,3385.77,3387.99,3388.8,3388.2,3379.58,3383.615,3387.65,3388.93,3392.59,3397.09,3396.19,3398.79,3400.85,3399.34,3400.19,3400.81,3398.71,3399.27,3399.83,3405.6,3404.69,3412.24,3400.81,3408.81,3407.82,3403.33,3407.47,3403.89,3404,3400.6099999999997,3397.22,3408.73,3416,3416.19,3415.8,3415.85,3416.31,3419.62,3423,3428.43,3425.97,3425.9799999999996,3425.99,3430.59,3437.4,3435.94,3432.81,3432.8,3443.01,3450.88,3451.99,3455.19,3453.61,3450.505,3447.4,3444.03,3448.58,3442.2,3439.72,3437.2,3427.4,3436.42,3430.8,3430.21,3425.61,3426.135,3426.66,3425.99,3432.6,3439.05,3435.9,3432.64,3430.8,3430.79,3434.51,3424.1,3423.61,3423.775,3423.94,3425.01,3426.04,3428.73,3435.44,3434.4,3429.16,3434.39,3431.32,3423.35,3423.99,3420.01,3416.03,3415.79,3415,3418.33,3412.67,3416.31,3419.52,3421.34,3421.82,3420.78,3424.62,3424.54,3424.46,3421.4,3418.97,3420.99,3417.27,3417.56,3415.86,3416.19,3419.01,3422.49,3418.78,3421.41,3424.04,3427.94,3430.6,3427.95,3427.46,3423,3424.73,3422.54,3425.21,3429.2,3432.14,3428.45,3431.67,3428.65,3426.22,3423,3426.81,3428.41,3425.81,3424.85,3422.2,3427.48,3429.16,3431.08,3434.76,3431.32,3433.88,3434.74,3437.19,3438.33,3453.4,3477.21,3468.62,3475.21,3470.57,3474.2,3488.22,3487.3,3537.22,3566.5,3564.49,3561.39,3569.56,3568.16,3567.08,3568.59,3603.42,3595.26,3594.74,3597.41,3603,3606.16,3612.7,3617.22,3610.82,3607.2,3609.29,3609.51,3609,3618.65,3611.46,3612.38,3621.78,3610.79,3625.79,3629.01,3624.2,3619.78,3622.85,3624.26,3618.17,3614.15,3614.99,3621.81,3624.57,3622.2,3626.6,3635.06,3626.99,3633,3625.81,3623.47,3628.69,3629.92,3644.25,3646.41,3656.79,3653.65,3649.11,3638.19,3639.19,3637.41,3646.97,3644.92,3642.74,3644.81,3649.34,3654.74,3648,3664.8,3659.39,3661.22,3648.99,3620.03,3637.65,3637,3626.41,3626.74,3627.18,3623.8,3638.37,3637.48,3636.79,3631.6,3641.39,3638.4,3627.41,3631.77,3647.21,3645.93,3647.19,3645.05,3644.99,3636.99,3638.02,3626.67,3629,3634.19,3631.46,3631.59,3629.19,3634.245,3639.3,3643.01,3642.76,3650.2,3640.28,3646.19,3654.42,3653.81,3656.2,3654.6,3663.59,3661.145,3658.7,3649,3652.79,3650.62,3649.12,3643.43,3646.65,3654.72,3657.4,3657,3664.21,3670.1949999999997,3676.18,3679.28,3679.99,3679.09,3676.5,3681.01,3689.2,3698.01,3710.33,3701.96,3693.8,3695.84,3690.99,3689.22,3694.41,3693.19,3688.2,3687.39,3684.37,3684.56,3686,3694.2,3703.98,3694.17,3693.79,3692.44,3690.01,3686.18,3688.34,3686.07,3683.72,3687.57,3689.99,3687.2,3690.03,3689.8,3691.27,3694.6,3691.77,3688.38,3692.59,3692.39,3690.19,3689.33,3686.01,3684.31,3683.81,3684.55,3684.25,3688.66,3691.96,3686.61,3691.96,3694.61,3693.15,3701.82,3698.08,3695.57,3703.36,3716.8,3713.52,3713.81,3714.21,3716.42,3717.65,3709.01,3699.3,3694.66,3697.19,3694.6,3695.58,3696.875,3698.17,3701.19,3705.39,3707.56,3698.61,3690.29,3703.25,3708.58,3701.38,3694.14,3699.4,3695.205,3691.01,3679.19,3676.6,3677.38,3684.09,3684.14,3685.06,3680.01,3687.65,3686.3,3681.6,3680.18,3679.24,3686.6,3691.29,3698.4,3711.26,3716.29,3711.62,3707.89,3703.4,3709.01,3708.87,3706.19,3704.76,3704.2,3715.4,3704.79,3705.88,3711.99,3704.64,3696.9,3694.79,3691.08,3692.39,3692.59,3686.29,3685.36,3685.01,3679.79,3686.61,3691.79,3694.42,3695.26,3697.52,3698.59,3698,3696.64,3699.61,3691.34,3691.15,3696.25,3698.98,3698.49,3693.23,3688.81,3685.71,3687.26,3687.2,3692.4,3695.97,3695.17,3695.06,3688.79,3676.86,3679.29,3678.06,3654.81,3648.2,3640.38,3645.4,3642.97,3649.98,3649.22,3656.72,3643.21,3640.2,3644.21,3646.13,3648.28,3644.81,3645.38,3646.01,3641.87,3631.15,3594.54,3598.56,3605.76,3602.8,3608.74,3605.81,3620.67,3615.89,3619.01,3626.88,3629.13,3636.94,3631.5,3643.75,3639.87,3639.6,3635.8,3639.25,3634.86,3631.62,3622.4,3622.98,3628.74,3634.5,3622,3622.99,3626,3624.57,3624.94,3621.09,3616.21,3618.42,3627.98,3629.79,3633.6,3637.41,3639.61,3639.6,3633.29,3638.22,3636.05,3632,3636.13,3633.21,3635.55,3628.2,3633.25,3638.3,3629.85,3629.6,3625.8,3629.8,3627.82,3625.41,3630,3634.6,3639.99,3636.82,3632.32,3627.82,3618,3620.94,3620.35,3614.42,3622.02,3630.6,3631.73,3623.52,3611.77,3607.31,3604.85,3602.39,3597.1,3602.24,3609.79,3602.68,3579,3565.6,3541.8,3524.18,3504.27,3515.62,3511.39,3507.16,3493.86,3499.22,3515.23,3514.01,3506.99,3511.22,3518.41,3519.2,3529.41,3526.79,3525.45,3524.11,3514.98,3524.2,3515.01,3518.69,3521.74,3511.71,3507.84,3504.3,3510.8,3503.04,3500.625,3498.21,3489.36,3471.39,3481.78,3486.82,3494.79,3496.75,3498.07,3500.44,3502.5,3498.58,3503.29,3508,3505.02,3502.83,3507.18,3507.21,3510.27,3505.99,3500.02,3501.37,3502.4,3501.51,3501.085,3500.66,3498.35,3495,3501.59,3510.41,3517.81,3516.39,3512.21,3517,3516.3,3518.41,3520.91,3523.41,3518.18,3519.47,3521.41,3519.03,3520.4,3520.22,3519.67,3515.61,3516.62,3515.75,3511.88,3508.01,3502.73,3505.22,3509.02,3502,3501.97,3503.82,3509.28,3504.12,3506.53,3506.49,3507.5649999999996,3508.64,3507.8,3505.01,3508.94,3513.02,3513.2,3516.89,3520.85,3519.6,3519.75,3517.87,3517.035,3516.2,3506.3,3503.21,3501.4,3498.6,3493.6,3490.02,3493.35,3504.6,3503.21,3505.55,3502.175,3498.8,3511,3515.21,3514.24,3517.39,3517.59,3506.39,3505.8,3510.51,3507.64,3502.8,3499,3495.2,3492.99,3495.77,3487.19,3479.2,3492.41,3497.07,3484.56,3488.09,3491.58,3505.24,3518.625,3532.01,3527.59,3529.61,3507.6,3514.41,3512.38,3503.59,3507.99,3486.91,3492.42,3466.79,3475.4,3484.01,3476.19,3484.82,3495.41,3482.4,3489.95,3494.33,3493.3,3492.42,3500.8,3506.21,3506.185,3506.16,3520.58,3517.38,3514.19,3518.4,3518.35,3515.4,3516.93,3518.97,3511.2,3509.7,3514.965,3520.23,3520.19,3527.58,3523.51,3527.83,3531.29,3535.34,3532.82,3537.59,3538.99,3537.41,3534.8999999999996,3532.39,3535.59,3531.01,3535.19,3540.58,3552.58,3550.6,3549.8,3549.41,3544.71,3540.84,3540.5550000000003,3540.27,3541.92,3547.41,3545,3540.19,3540.27,3543.3,3542.62,3542,3541.58,3539.5,3524.54,3509.58,3509.15,3515.01,3515.82,3515.4,3516.44,3513.38,3512.81,3520.82,3521.42,3515.01,3515.01] \ No newline at end of file +[3467.09,3469.6,3469.61,3481.79,3488.19,3480.74,3471,3473.79,3481.36,3481.6800000000003,3482,3484.04,3478.01,3469.07,3477.52,3484.79,3499.86,3502.98,3499.48,3509.04,3524.02,3521.3450000000003,3518.67,3519.6,3515.14,3527.86,3541.84,3530.39,3524.15,3521.79,3518,3516.44,3518.51,3514.155,3509.8,3508.61,3511.6,3495.59,3497.79,3494.92,3483.4,3492.41,3504.09,3498.15,3501.01,3496.2250000000004,3491.44,3491.28,3497.13,3499.34,3501.23,3503.55,3500.8,3505.18,3512.39,3518.01,3519.41,3517.3,3515.19,3513.88,3513.41,3521.81,3522.8,3514.41,3514.93,3513.93,3516.99,3514.23,3514.98,3513.275,3511.57,3508.7,3509.23,3508.2,3507.09,3502.6,3503.82,3502.79,3496.82,3502.76,3509.2,3519.14,3529.08,3535.63,3534.32,3538.14,3554.08,3552.24,3553.46,3552.98,3546.59,3547.21,3543.1,3541.55,3540,3544.81,3540.62,3535.3,3537.7,3544.88,3540.8,3543.67,3539.42,3541.99,3540.95,3538.575,3536.2,3531.57,3533.86,3533.76,3529.19,3531.57,3532.8,3533.48,3533.66,3529.78,3531.41,3534.49,3537.57,3536.4,3536.26,3538.99,3539.01,3530.35,3534.22,3538.43,3533.35,3529.02,3533.18,3532.5950000000003,3532.01,3544.88,3541.86,3542.38,3548.36,3549.7,3552.1,3555.19,3560.12,3565.06,3558.64,3566.34,3560.79,3560.73,3559.6,3559,3564.59,3560.01,3561.4,3567.65,3571.79,3567.76,3570.8,3575.87,3563.53,3564.58,3565.54,3560.61,3564.25,3561.07,3561.21,3555.6,3558.61,3557.37,3561.99,3561.35,3564.58,3565.36,3569.24,3563.78,3556.8,3560,3564.28,3562.2,3558.88,3563.81,3563.94,3566.41,3568.88,3568.52,3568.61,3568.03,3564.95,3564.18,3571.33,3571.84,3576.91,3579.32,3577.38,3580.565,3583.75,3589.06,3580.4,3591.36,3601.13,3594.49,3595,3588.35,3587.21,3591.29,3585.17,3582.99,3580.81,3584.03,3589.83,3598.32,3594.76,3596.27,3604,3602.8,3606.47,3616.92,3612.74,3606.2749999999996,3599.81,3596.65,3597.83,3595.58,3589.79,3590.97,3588.81,3582.93,3583.47,3583.2,3579.93,3581.465,3583,3582.5,3570.6,3572.39,3572.73,3571.42,3572.82,3567.49,3563.67,3564.54,3567.35,3564.865,3562.38,3562.99,3561.59,3559.18,3561.81,3558.89,3553.22,3543.6,3545.41,3542.39,3531.79,3531.8050000000003,3531.82,3534.73,3533.59,3538.03,3536.32,3526.41,3561.68,3564.77,3564.1,3557.99,3552.73,3556.975,3561.22,3560.48,3564.38,3557.22,3552.8,3556.07,3564.56,3530.4,3505,3505.01,3514.3,3519.95,3525.6,3517,3511.59,3490.66,3499.72,3496.94,3504.13,3508.02,3504.39,3504.19,3505.05,3503.84,3502.63,3503.34,3501.19,3504.78,3504.71,3496.89,3491.75,3500.01,3501.94,3500,3493,3504.27,3515.54,3515.2,3511.54,3508.19,3495.71,3493.23,3493.24,3479,3491.08,3494.39,3503.4,3505.81,3508.22,3506.01,3514.78,3515.57,3518,3514.79,3509.37,3508,3510.66,3513.12,3515.99,3512.285,3508.58,3514.23,3507.66,3504.63,3506.83,3504.1,3500.9,3503.45,3511.19,3501.7,3504.52,3502.865,3501.21,3501.18,3504.53,3502.81,3508.72,3511.63,3510.02,3513.76,3517.65,3512.41,3512.26,3515.495,3518.73,3516.01,3520.27,3519.99,3530.37,3523.46,3519.26,3518.41,3518.61,3519.98,3521.09,3520.645,3520.2,3521.84,3522.67,3510.66,3510.97,3503.66,3509.6,3501.87,3502,3502.27,3500.47,3501.3149999999996,3502.16,3502.16,3507.96,3509.62,3510.11,3511.01,3505.41,3500.99,3505.42,3504.8,3506,3507.925,3509.85,3509.41,3504.43,3500,3499.26,3497.6,3502.4,3503.8,3505.62,3507.92,3508.33,3508.065,3507.8,3509.53,3512.35,3512.26,3509.32,3518.48,3521.22,3521.07,3524.44,3523.59,3522.78,3522.8900000000003,3523,3516.59,3516.71,3515.26,3511.61,3510.29,3511.48,3512.78,3510.75,3514.4,3511.61,3509.5299999999997,3507.45,3512.21,3522.5,3523.03,3525.64,3528.59,3528.9,3526.62,3524.2,3525,3523.8,3520.01,3523.66,3523.18,3523.62,3524.56,3528.21,3535.42,3533.35,3534.26,3531.2,3529.74,3529.96,3534.68,3534.04,3530.2,3534.46,3537,3540.03,3537.89,3542.79,3544.41,3542.41,3550,3550,3547.42,3547.42,3544.78,3544.96,3546.34,3545.32,3545.2,3544.81,3544.39,3542.2,3539.61,3541.81,3541.05,3539.33,3535.29,3534.39,3533.94,3533.16,3531.73,3529.37,3530.48,3532.73,3531.22,3533.7,3536.535,3539.37,3534.97,3534.41,3530.23,3529.69,3533.24,3523.99,3516.8,3517.03,3513.24,3511.55,3512.48,3513.41,3520.85,3524.46,3527.4,3520.9,3521.82,3513.59,3521.8,3520.59,3520.01,3522.05,3523.7650000000003,3525.48,3518.98,3525.01,3518.95,3522.66,3519.49,3517.74,3516.88,3512.16,3509.31,3514.08,3512.3050000000003,3510.53,3512.03,3516.7,3515.61,3518.41,3515.23,3511.8,3523.56,3518.27,3527.04,3531.64,3534.515,3537.39,3537.76,3535.27,3538.77,3539,3534.17,3535.88,3534.39,3538.08,3537.35,3534.03,3530.945,3527.86,3527.19,3525.99,3524.4,3521.24,3520.54,3514,3494.79,3493.53,3497.41,3497.84,3491.885,3485.93,3478.48,3491.39,3485.93,3472.39,3477.39,3484.27,3473.46,3455.77,3454.49,3462.67,3468.02,3473.37,3459.39,3463.12,3468.73,3469.46,3464,3467.01,3453,3462.33,3453.29,3448.6,3446.29,3443.98,3442.59,3443.95,3445.76,3445.39,3457.4,3455.51,3449.41,3445.23,3446.58,3443.2,3445.9049999999997,3448.61,3444.26,3427.78,3418,3425.88,3430.34,3434.41,3431.31,3423.45,3430.38,3433.54,3426.605,3419.67,3417.35,3417.31,3412.65,3385.6,3319.56,3326.41,3341.81,3339.94,3338.62,3338.62,3335.415,3332.21,3330.98,3338.15,3321.8,3314,3304.25,3223.51,3198.41,3223.12,3209.78,3215.81,3217.7,3219.59,3225.89,3219.42,3226.4,3226.41,3224.58,3234.54,3217.87,3221.54,3212,3209.18,3218.18,3227.18,3229.02,3248.6,3253.37,3244.58,3245.04,3241.86,3239.38,3236.75,3235.07,3221,3216.9049999999997,3212.81,3215.6,3213.55,3217.66,3217.21,3220,3219.41,3210.78,3213.74,3216.86,3216.65,3214.5299999999997,3212.41,3215.64,3219.41,3218.62,3226,3222.38,3219.8,3218.19,3216.35,3213.6,3214.98,3212.49,3210,3209.74,3218,3213.97,3222.92,3224.03,3226.02,3233.5,3241.24,3240.6,3243.2,3234.7799999999997,3226.36,3226.98,3225,3223.85,3226.28,3233.47,3227.58,3226.76,3221.61,3224.07,3227.79,3225.1949999999997,3222.6,3219.6,3216.01,3214.42,3204.13,3204.6,3188.12,3188.26,3184.42,3175.48,3163.77,3169.92,3176.07,3177.66,3185.57,3176.54,3192.8,3200.79,3196.41,3200.21,3211.18,3211.26,3209.3,3209.59,3209.88,3205.05,3204.21,3207.59,3211.76,3214.09,3220,3219.85,3221.29,3223.45,3223.07,3224.13,3225.19,3229,3232.2,3230.4,3230.82,3237.6,3233.81,3240.86,3249.81,3264.14,3256.18,3254.4449999999997,3252.71,3256.49,3255.34,3256.32,3259.8,3260,3252.6,3249.19,3252.89,3248,3250.64,3250.8199999999997,3251,3251.52,3250.54,3247.8,3249.63,3258.34,3254.82,3255,3262.59,3256.81,3260.18,3263.4049999999997,3266.63,3264.08,3256.96,3251.99,3253.08,3255,3258.36,3261.01,3260.07,3257.18,3253.96,3253.81,3253.66,3253.67,3250.62,3258.49,3257,3263.86,3258.65,3259.64,3253.9,3250.36,3249.41,3252.1949999999997,3254.98,3258.01,3253.2,3257.03,3258.69,3257.6,3260.29,3261.11,3262.6,3269.41,3263.21,3262.995,3262.78,3265.51,3268.41,3267.36,3266.21,3260.89,3264.87,3264.19,3265.79,3268.01,3276.19,3278.355,3280.52,3294.26,3283.48,3294.01,3287,3276.68,3281.8,3280.19,3278.88,3270.39,3266.48,3268.4049999999997,3270.33,3262.28,3262.74,3264.24,3262.56,3264.26,3269.38,3278.21,3276.99,3280.66,3281.98,3281.96,3281.94,3285.41,3284.01,3289.58,3285.18,3280.83,3271.16,3268.6,3266.91,3270.41,3269.59,3267.485,3265.38,3270.48,3273.21,3270.96,3272.42,3271.01,3264.69,3253.36,3259.32,3260,3256.79,3258.62,3260.45,3260.19,3256.28,3264.68,3268.29,3292.81,3284.76,3282.9,3282.79,3273.19,3271.53,3271.23,3270.93,3265.26,3262.19,3264.6,3243.98,3248.45,3261.01,3261.59,3255.01,3243.09,3244.59,3240.385,3236.18,3233.4,3228.79,3225.88,3221.41,3210.99,3224.91,3200.99,3214.09,3218.67,3212.01,3200.11,3188.21,3193.58,3210.3,3221.61,3221.41,3218.98,3214.35,3214.12,3230.39,3224.83,3230.62,3229.1099999999997,3227.6,3224.59,3218.59,3214.62,3212.3,3210.8,3210.61,3206.79,3191.62,3156.8,3076.93,3071.26,3065.59,2856.73,2935.72,2916.96,2938.06,2924.46,2952.95,2955.01,2961.21,2894.02,2892.94,2917.165,2941.39,2924.59,2921.21,2910.01,2894.19,2863.58,2886.18,2888.55,2896.25,2915.35,2925.38,2927.19,2929,2916.62,2907.6,2920.6,2944.19,2937,2984.03,3006.2,3022.65,3005.56,3012.21,3023.26,3034.31,3052.38,3040.79,3042.78,3039.19,3024.98,3028.21,3035.36,3022.4,3021.51,3014.4,3013.5550000000003,3012.71,3015.8,3002.21,2982.94,2944.71,2966.62,2974.61,2980.72,2988.01,2981.21,2974.66,2974.825,2974.99,2948.61,2953.6,2967.6,2980.02,2985.19,2999,2999.38,2998.13,2988.39,3004.41,3001.3999999999996,2998.39,2988.81,2984.21,2973.49,2974.2,2977.91,2970.01,2963.8,2957.64,2963.64,2967.19,2952.125,2937.06,2933.61,2914.19,2939.2,2936.25,2934.47,2947.05,2961.79,2962.6,2959.2,2953.81,2960.605,2967.4,2977.4,2984.85,3010.63,3024.81,3040.54,3034.37,3036.59,3038.06,3040.21,3037.07,3042.135,3047.2,3049.99,3061.42,3043.8,3040.37,3051.04,3054.94,3067.17,3070.18,3061.98,3072.91,3068.555,3064.2,3060.19,3065.13,3067.02,3087.47,3087.83,3081.98,3091.87,3096.56,3093.99,3089.6,3089.29,3088.98,3090.6,3080,3088.5,3080.7,3077.44,3083.44,3088.17,3086,3081.39,3078.29,3078.52,3078.75,3085.66,3088.11,3083.54,3084.42,3098.1,3091.02,3093.81,3080.62,3069.59,3064.41,3066.075,3067.74,3067.79,3057.5,3058.84,3054.41,3055.52,3047.8,3029,3035.41,3041.23,3033,3042.94,3052.88,3047.6,3041.15,3034.39,3037.63,3043.99,3058.98,3058.75,3058.49,3059.1,3059.55,3051.6850000000004,3043.82,3036.6,3036.83,3031.8,3024.2,3026.75,3026.38,3023.25,3011.28,3025.24,3021.78,3030.9750000000004,3040.17,3037.41,3030.28,3036.6,3031.97,3028.22,3034.02,3039.38,3043.57,3061.61,3049.86,3044.7799999999997,3039.7,3052.81,3061.33,3052.65,3052.41,3054.62,3047.21,3042.05,3042.27,3029.81,3034.87,3025.8450000000003,3016.82,3013.7,3016.16,3014.38,3018.21,3023.94,3026.45,3031.6,3045.56,3033.79,3033.22,3039.58,3045.94,3037.28,3037.9,3045.49,3046.8,3062.81,3051.97,3052,3054.82,3048.61,3048,3055.66,3063.32,3069.21,3070.17,3075.7,3080.19,3094.01,3086.2,3088.19,3090.02,3090.02,3090.02,3087.55,3085.08,3089.2,3039.42,3026,2988.81,3017.19,3051.4,3069.41,3065.66,3051.16,3053.62,3048.91,3044.2,3064.18,3080.61,3073.82,3071.01,3070.87,3084.2,3084.66,3083.86,3077.19,3088.22,3082.6049999999996,3076.99,3073.88,3072.37,3071.97,3068.4,3064.68,3069.84,3070.4,3075.38,3074.27,3074,3078.1,3082.2,3085.2,3070.78,3072.89,3071.21,3075.18,3078.4,3076.58,3077.16,3063.79,3063.78,3065.29,3066.8,3066.8,3065.07,3061.92,3055.61,3061.29,3059.2,3055.38,3051.99,3055.86,3062,3091.34,3120.68,3154.2,3142.99,3142.01,3154.21,3154.3,3151.57,3168.31,3155.56,3149.57,3160.74,3156.555,3152.37,3155.44,3156.94,3158.21,3165.18,3161.8,3154.31,3160.41,3163.63,3155.06,3151.14,3146.6499999999996,3142.16,3142.32,3141.39,3135.95,3129.81,3125.81,3131.07,3124,3121,3121,3121,3115.63,3110.26,3109.6,3112.18,3117.82,3123.12,3124.03,3123.1,3121.99,3124.21,3122,3128.19,3128.83,3129.78,3133.06,3129.15,3131.8,3135.17,3138.51,3132.96,3127.92,3132.78,3139.18,3138.47,3138.29,3141.41,3148,3140.21,3140.28,3143.67,3147,3144.86,3151.43,3156.25,3152.49,3148.6,3146.2,3143.46,3129.88,3127.02,3135.99,3138.2,3138.19,3132.38,3134.91,3138.49,3137.41,3139.5,3139.625,3139.75,3139.94,3137.6,3138.62,3142.48,3142.07,3147.61,3149.38,3146.58,3148.96,3157.8,3157.5950000000003,3157.39,3168.41,3190.21,3212.15,3220.9,3244.79,3243.54,3243.6,3242.41,3229.72,3237.36,3234.6800000000003,3232,3234.48,3232.2,3242.39,3239.76,3237.27,3244.83,3244.91,3241.32,3245.37,3245.98,3248.895,3251.81,3237.98,3239.4,3250.47,3257.99,3254.62,3258.21,3259.19,3259.59,3250.75,3248.06,3243.45,3238.84,3240,3244.2,3247.19,3248.61,3249.8,3247.99,3251.6,3255.38,3260.94,3259.61,3257.04,3254.47,3258.88,3258.33,3253.94,3255.14,3252.76,3252.91,3253.87,3254.13,3257.79,3262,3266.8,3271.6,3253.22,3245.19,3255.6,3250,3246.06,3241.57,3238.57,3236.4,3239.77,3238.23,3239.525,3240.82,3236.23,3237.21,3235.23,3232.02,3233.19,3233.88,3237.11,3238.5,3236.22,3231.4,3229.705,3228.01,3232.64,3234.84,3232.31,3227.01,3227.68,3219.36,3206.41,3218.41,3219.67,3203.4,3201.91,3200.42,3191.39,3173.91,3192.4,3187.4,3185.19,3191.14,3170.56,3162.21,3143.82,3143.86,3135.13,3126.4,3130.46,3135.81,3151.22,3145.01,3148.41,3147.21,3148.58,3140.22,3151.29,3157.61,3164.79,3171.97,3167.68,3165.12,3151.42,3152.3,3155.01,3156.77,3147.05,3148.61,3146.61,3147.53,3144.565,3141.6,3162.07,3156.8,3135.68,3119.46,3102,3112.6,3101,3098.48,3103.05,3118.34,3119.07,3119.8,3118,3112.51,3086.6,3077.34,3086.57,3088.29,3083.95,3095.01,3084.98,3071.39,3056.71,3042.03,3055.46,3070.85,3060.37,3084.5,3084.2,3100.01,3104.81,3103.82,3110.83,3107.46,3108.745,3110.03,3109.8,3105.08,3102.53,3081,3093.61,3092.8,3088.6,3093.58,3083.95,3083,3086.65,3090.3,3098.01,3095.16,3089.85,3076.67,3085.8,3081.82,3080,3089.68,3094.86,3095.6,3098.495,3101.39,3099.17,3097.61,3090.04,3091.97,3105.06,3118.18,3118.59,3122.51,3121.21,3119.88,3121.7650000000003,3123.65,3119.95,3123.21,3110.79,3108.59,3101.62,3094.79,3098.33,3107.14,3100.27,3101.4,3102.0950000000003,3102.79,3093.59,3106.05,3087.79,3087.79,3077.61,3083.01,3074.34,3069.22,3077.81,3079.83,3078.64,3077.45,3091.21,3095.99,3108.35,3112.49,3109,3117.42,3105.52,3097.92,3088.68,3076.79,3076.355,3075.92,3079.87,3077.52,3071.4,3071.41,3057.89,3071.67,3076.71,3083.48,3093.19,3095.8,3099.8900000000003,3103.98,3101.67,3095.47,3090.17,3089.4,3080.2,3073.2,3072.2,3058.14,3071.07,3066.21,3071,3075.79,3068.2,3047.39,3053.21,3045.69,3033.79,3033.96,3037.64,3019.01,3017.1,3020.71,3027.02,3033.33,3029.99,3035.5,3041.89,3044.2,3047.22,3042.83,3051.22,3053.81,3054.39,3048.21,3057.4049999999997,3066.6,3062.36,3059.13,3061.2,3068.74,3069.31,3068.95,3070.99,3072.78,3082.76,3085.18,3086.555,3087.93,3088,3085.44,3095.4,3092.98,3093.1,3116,3115.64,3100,3102.43,3108.91,3107.98,3107.05,3099,3093.43,3093.76,3090.02,3087.92,3094.6,3093.45,3084.39,3090.56,3087.02,3090.725,3094.43,3092.59,3085.48,3091.35,3090.82,3096.55,3091.38,3092.2,3085,3083,3078.79,3084.205,3089.62,3083.21,3076.42,3053.7,3045.23,3017.6,3013.59,3026.83,3036.19,3050.47,3039.21,3055.3050000000003,3071.4,3061.17,3061.02,3051.21,3066.4,3065.16,3059.77,3064.99,3053.58,3066.59,3088.15,3084.2250000000004,3080.3,3072.9,3073.37,3068.63,3076.41,3082.75,3077.69,3084.81,3080.1,3071.79,3072.2,3071.095,3069.99,3078.52,3078.22,3082.33,3075.98,3088.25,3082.18,3075.46,3066.01,3050.6,3041.99,3056.1049999999996,3070.22,3084.02,3084.21,3084,3074.92,3062,3043.59,3050.83,3064.62,3062.79,3052.44,3047.91,3043.38,3046.12,3029.79,3039.4,3044.62,3045.03,3035.99,3019.39,3021.62,3013.96,3018.18,3018.785,3019.39,2999.92,3015.99,3013.54,3011.8,3016.39,3016.26,3021.23,3030.15,3039.4,3049.58,3050.79,3052,3068.53,3066.14,3073.47,3074.79,3072.67,3050.11,3058.41,3062.21,3046,3039.56,3041.615,3043.67,3060.59,3056.02,3049.36,3052.27,3057.61,3066.71,3067.76,3064.74,3063.53,3068.55,3067.875,3067.2,3071.81,3065.21,3068.33,3069.76,3068.06,3062.77,3060.11,3058.99,3060.61,3057.84,3058.415,3058.99,3051.99,3059.84,3065.19,3067.37,3066.81,3066.2,3061.21,3061.2,3063.14,3064.75,3071.075,3077.4,3084.19,3086.6,3094.59,3101.01,3096.99,3094.68,3091.4,3095.34,3116.98,3109,3102.81,3096.62,3092.02,3091.51,3085.78,3080.76,3083.77,3086.8,3089,3089.4,3092.33,3091.36,3091.795,3092.23,3089.5,3088.6,3090.22,3094.39,3092.44,3090.07,3088.92,3089.5,3083.05,3080.9,3082.175,3083.45,3081.53,3082.98,3077.99,3085.95,3084.21,3079.6,3080.62,3087.43,3100.85,3099.99,3094.825,3089.66,3081.21,3077.85,3076.76,3087.12,3093.47,3090.97,3084.39,3084.73,3086.39,3094.2,3091.28,3098.4,3096.9,3093.79,3082.92,3074.41,3079.63,3079.2,3079.58,3079.41,3079.51,3085.48,3086.475,3087.47,3091.57,3092.32,3087.2,3093.21,3092.38,3091.38,3095.97,3090.87,3084.39,3083.64,3089.2200000000003,3094.8,3090.8,3095.09,3089.4,3092.01,3095,3107.85,3115.01,3117.4,3117.49,3120.53,3119.87,3119.21,3109.73,3113.21,3115.39,3107.21,3104.42,3110.21,3103.8,3100.61,3089.79,3088.41,3088.71,3089.01,3090.37,3091.41,3088.18,3091.38,3090.03,3092.02,3095.95,3095.76,3093.05,3095.22,3093.455,3091.69,3074.8,3077.99,3077.19,3084.3,3083.57,3081.98,3081.6,3084.59,3082.59,3083.63,3083.41,3083.19,3083.02,3080.6,3074.78,3083.38,3084.13,3081.2,3080.79,3078.6,3071.38,3074.42,3076.635,3078.85,3077.2,3079.53,3081.36,3084.31,3086.6,3083.22,3084.93,3079.21,3077.78,3078.43,3076.09,3073.75,3072.41,3064.4,3066.2,3069.75,3069.84,3071.41,3065.58,3062.97,3058.88,3057.34,3061.58,3065.82,3068.33,3068.03,3069.82,3068.81,3066.84,3061.61,3061.42,3063.08,3051.79,3042.39,3044.5299999999997,3046.67,3048.98,3036.62,3040,3033.99,3031.08,3030.96,3024.81,3023.41,3025.19,3028.6,3032.8999999999996,3037.2,3024.38,3030.67,3034.63,3037.65,3039.32,3037.82,3057,3054.8,3045.47,3044.12,3033.23,3022.34,3017,3013.69,2971.87,2971.79,2973.31,2953.83,2979.24,2997.4,2998.81,2978.72,2972.755,2966.79,2963.8,2954.37,2966.41,2973.39,2948.47,2943.47,2943.47,2943.47,2949.545,2955.62,2943.8199999999997,2932.02,2949.82,2989.6,2970.44,2960,2970.18,2972.01,2959.61,2951.21,2958.5,2966.19,2963.69,2961.19,2964.63,2963.6,2972.67,2975.02,2980.49,2975.98,2985.41,2984.08,2990.4,2995.95,3014.005,3032.06,3029.35,3029.81,3026.2,3037.38,3035.94,3023,3029.09,3040.62,3033.09,3025.4,3020.3,3015.2,3007.59,3009.61,3011.2,2999.19,2999.8,3008.81,2989.8,2995.99,3006.79,3010.61,3009.62,3008.63,3001.42,2996.5,3006.3,3007.61,3004.09,2999.66,3001.61,2991.77,2980.27,2967.02,2973.92,2980.82,2991.04,3000.82,3010.58,3008.9,3004.4,3000.75,2996.28,2989.45,2997.15,2993.79,2991.66,2989.53,2993.47,2991.05,2988.39,2992,2993.24,3002.66,2999.32,3000.44,3002.27,3003.59,3002.565,3001.54,3010.39,3003.2,2990.02,2988.95,2982.02,2982.65,2983.46,2983.39,2981.86,2982.42,2987.34,2992.26,2986.2,2976.1,2971.32,2964.79,2966.71,2959.59,2962.17,2971.23,2983.98,2982.97,2993.56,3004.15,3006.99,3009.36,3002,2998.7,3005.39,2998.39,2997.99,2992.4,2995.94,2988.39,3003.99,3010.81,3008.36,3004.6,2996.54,2994.67,2999.92,3001.43,3006.76,3008.99,3005.61,3008.17,3011.04,3018.51,3030.02,3030.9,3023.05,3022.5,3021.19,3025.42,3027.63,3025.98,3022.42,3023,3025.11,3026.66,3027.96,3024.42,3023.61,3025.86,3029.42,3032.42,3029.67,3023.57,3018.99,3013.96,3014,3016.88,3014.59,3012.17,3013.35,3015.79,3018,3014.84,3006.91,3004.17,3005.69,3003.13,2983.61,2981.11,2975.13,2981.8,2975.39,2971.41,2973.19,2966.74,2960.59,2960.74,2963.56,2969.5,2971.25,2973,2978.2,2982.2,2978.66,2981.07,2979.45,2977.2,2968.11,2974.5,2981.05,2978.69,2979.55,2980.41,2965.83,2962.28,2962.34,2960.8,2970.79,2985.71,2982.77,2983.82,2984.9,2981,2986.67,2992.34,2992.17,3000.39,2995.22,2998,2998.94,3003.5,2996.34,2994.2,3001.95,3006.25,3004.525,3002.8,3004.94,2999.62,3004.24,3000.75,3005.34,3005,3009.4,3004.46,3004,3005.01,3012.5600000000004,3020.11,3021.01,3028.39,3052.59,3056.6,3056.59,3052,3051.62,3050.97,3044.52,3047.95,3046.3199999999997,3044.69,3036.61,3036.81,3036.18,3033.79,3014.94,2995.11,3010.54,3025.03,3020.48,3023.21,3021.8,3020.39,3025.6,3025.18,3025.79,3032.53,3032.19,3032.01,3013.92,3026.26,3039.61,3035.14,3036.98,3038.82,3058.57,3074.65,3084.1,3080.76,3079.61,3075.01,3082.81,3075.96,3073.99,3060.26,3068.23,3076.2,3087.39,3078.68,3072.57,3063.39,3059.41,3062.79,3063.16,3066.39,3062.61,3064,3066.165,3068.33,3059.79,3065.5,3069.99,3077.02,3079.31,3069.53,3071.81,3066.61,3063.5,3061.72,3060.575,3059.43,3058.84,3060.85,3056.92,3049.99,3053.15,3053.2,3054.02,3057.29,3050.1,3038.55,3040.1800000000003,3041.81,3031.99,3018.66,3030.34,3036.63,3039.8,3037.22,3042.84,3055.01,3053.6,3051.13,3056.465,3061.8,3057.36,3053.42,3057.71,3063.28,3059.36,3062.61,3056.91,3059.94,3058.8,3059.31,3060.27,3061.23,3063.19,3070.09,3065.54,3065.93,3068.11,3063.33,3062.1,3066.55,3060.76,3065.54,3067.685,3069.83,3069.01,3071.62,3074,3061.87,3064.01,3066.59,3064.99,3069.46,3071.44,3069.22,3066.71,3064.2,3060.73,3063.9,3059.2,3058.59,3062.34,3071.8,3072.94,3073.57,3067.59,3066.35,3066.5699999999997,3066.79,3070.67,3077.63,3073.43,3069.91,3068.73,3066.85,3064.03,3065.06,3065.7,3062.78,3061.76,3060.74,3053.19,3047.51,3054.33,3052.26,3051.19,3065.59,3062.31,3059.71,3057.36,3054.34,3044.7650000000003,3035.19,3030.61,3012.41,3014.79,3009.75,3012.18,2983.32,2954.87,2940.19,2953.14,2952.42,2949.645,2946.87,2927,2923.23,2906.8,2901.01,2876.2,2893.69,2892.24,2889.81,2878.8,2918.4,2932.8050000000003,2947.21,2959.59,2984.64,2970.22,2995.39,2998.76,2983.4,2975.3,2984.54,2972,2983.82,2990.46,2997.1,2999.79,2997.58,2996.41,2997.64,2992,2998.91,3017.53,3001.96,2996.95,2999.98,2998.9700000000003,2997.96,2996.99,2996.75,2988,2997.46,2995.32,2989.6,2991.6,3000.41,3012.78,2999.89,2998.34,2996.79,2992.4,2994.41,2991.14,2992.21,2997.5,3008.43,3035.35,3058.95,3079.77,3098.19,3106.86,3115.53,3114.01,3087.55,3079.79,3081.25,3076.24,3084.49,3081.2,3081.04,3084.28,3079.99,3086.385,3092.78,3110.92,3100.21,3117.97,3113.26,3094.38,3083.22,3096.23,3098.4,3101.09,3109.83,3107.26,3104.69,3106.13,3108.42,3107.77,3102.19,3097.38,3101.4,3101.24,3093.21,3105.54,3097.99,3102.795,3107.6,3099.1,3097.02,3094.02,3096.01,3092.99,3086.41,3087.69,3089.61,3093.36,3098.72,3104.2799999999997,3109.84,3109.34,3103.45,3098.19,3097.78,3092.57,3100.4,3111.77,3117,3102.97,3102.04,3101.8199999999997,3101.6,3093.29,3104.34,3106.84,3107.79,3117.36,3113.56,3110.79,3109.01,3112.4,3100.19,3098.895,3097.6,3087.95,3086.6,3084.6,3086.4,3091.75,3100.8,3093.68,3100.79,3100.67,3098.18,3096.48,3094.78,3092.89,3084.94,3085.39,3076.82,3062.97,3080.6,3073.12,3084.22,3088.8,3087.41,3083.1949999999997,3078.98,3086.76,3084.83,3081.16,3085.41,3089.27,3085.73,3085.99,3088.61,3088.11,3082.18,3084.39,3086.6,3075.37,3067.23,3063.54,3047.01,3056.24,3058,3055.68,3066.01,3072.38,3069.63,3068.15,3066.67,3067.38,3069.02,3069.85,3072.03,3061.38,3070,3069.79,3080.46,3079.73,3088.22,3080.49,3072.76,3074.81,3077.41,3080.44,3077.02,3077.78,3077.39,3075.82,3073.01,3075.79,3075.63,3077.82,3080.01,3083.8,3084.8,3085.96,3087.63,3087.6,3087.85,3087.85,3087.85,3087.85,3087.85,3093.165,3098.48,3092.64,3089.01,3093.41,3093.4,3093.55,3089.35,3077.78,3078.56,3073.99,3073.48,3078.935,3084.39,3088.48,3089.18,3091.63,3092.82,3093.41,3097.06,3097.25,3096.56,3098.7,3097.59,3098.7,3099.81,3100.93,3104.41,3097.62,3099.81,3094.82,3080.99,3081.4,3082.61,3080.33,3075.59,3054,3032.41,3041.44,3042.81,3047.8,3045.94,3044.2,3047.34,3052.99,3057.87,3065.21,3064.66,3060.825,3056.99,3062.61,3049.82,3039.99,3062.39,3055.15,3055.01,3049.2,3048.39,3036.18,3035.21,3030.895,3026.58,3027.5,3031.84,3040.1,3036.24,3041.42,3045.19,3048.58,3051.81,3055.38,3056.57,3053.6850000000004,3050.8,3053.03,3052.86,3048.61,3051.26,3056.41,3052.58,3057,3061.19,3065.81,3056.82,3053.925,3051.03,3051.97,3053.01,3052.83,3059.02,3054,3054.2,3051.6,3053.5,3050.41,3053.59,3055.0950000000003,3056.6,3052,3050.98,3051.03,3053.4,3059.09,3059.32,3063.37,3064.41,3066.43,3057.87,3059.64,3061.41,3061.2,3061.33,3058.95,3058.6,3060.81,3065.04,3065.81,3068.21,3064.49,3063.47,3062.42,3061.37,3058.63,3058.9,3058.59,3061.3,3062.35,3064.41,3066.63,3063.8,3070.27,3063.7,3066.58,3069.46,3065.4,3062.6,3062.08,3061.71,3060.79,3062.56,3063.07,3063.98,3060.79,3062.4,3059.79,3057.18,3046.36,3050.68,3050,3052.81,3055.13,3053.22,3053.39,3054.99,3052.01,3048.22,3043.005,3037.79,3037.7,3041.2,3039.39,3043.79,3044.33,3042.45,3041.82,3042.59,3035.81,3036.99,3038.8,3040.61,3039.98,3042.99,3036.05,3034.2,3035.39,3037.41,3041.42,3041.79,3042.19,3040.2,3039.89,3039.58,3047.4,3050.02,3052.61,3050.01,3047.79,3048.96,3052.39,3048.98,3051.83,3052.4,3051.9,3051.4,3051,3052.73,3050,3045.59,3046.8,3052.38,3054.12,3061.8,3067.08,3063.18,3064.4399999999996,3065.7,3062.4,3062.17,3060.78,3061.42,3063.42,3065.19,3067.42,3063.8,3062.56,3060.34,3062.77,3065.2,3064.02,3060.21,3061.38,3059.99,3060.9,3057.78,3055.88,3061.41,3066.57,3067.14,3064.875,3062.61,3057.8,3060.26,3062.95,3062.01,3063.99,3076.01,3086.2,3092.62,3108.01,3106.58,3101.495,3096.41,3092,3099.25,3103.01,3097.77,3101.59,3098.68,3104.62,3104.08,3100.43,3101.5,3102.835,3104.17,3112.16,3113.4,3127.8,3137.8,3138.15,3134.75,3143.61,3160,3153.22,3156.4,3158,3159.6,3142.79,3148.22,3142.62,3144.28,3148.36,3151.01,3145.04,3145.39,3142,3140.46,3139.24,3138.02,3136.92,3131.99,3137.78,3139.22,3137.74,3143.21,3143.61,3149.85,3148.39,3144.59,3150.04,3155.49,3163.24,3161.79,3155.6,3149.59,3151.67,3157.38,3159.87,3160.84,3154.19,3152.66,3154.8,3156.94,3160.72,3160.4,3159.92,3153.01,3155.04,3154.58,3151.42,3157,3156.41,3152.02,3149.01,3146,3147.47,3143,3148.42,3152.01,3152.59,3153.91,3147.81,3148.99,3146.19,3146.56,3144.045,3141.53,3144.22,3148.61,3156.66,3158.64,3160.63,3155.62,3153.76,3155.78,3150.75,3151.21,3149.49,3147.77,3146.04,3148.39,3148.57,3144.6,3146.77,3136.79,3132.44,3134.2,3130.59,3135.79,3140.89,3145.99,3144.78,3146.78,3148.87,3148.09,3151.6,3152.04,3151.61,3150.8,3150.2,3149.97,3148.925,3147.88,3146.59,3149.61,3152.41,3165.2,3178.58,3185.67,3172.14,3168.25,3167.96,3172.19,3177.495,3182.8,3193.39,3189.21,3182.8,3180.85,3168.99,3176,3176.19,3170.58,3167.61,3167.81,3166.915,3166.02,3166.93,3161.6,3162.22,3163.93,3163.19,3162.68,3166.87,3169.6,3176.14,3179.26,3179.035,3178.81,3178.94,3183.99,3184.61,3184.82,3177.08,3179.99,3175.51,3172.74,3176.59,3177.2,3176.5299999999997,3175.86,3173.35,3175.46,3185.58,3189.01,3190.5,3186.32,3181.23,3182.08,3179.54,3177.36,3177.3450000000003,3177.33,3180,3178.82,3180.07,3178.58,3172.67,3168.89,3170.13,3175.05,3174.44,3179.21,3180.4,3181.59,3184.98,3181.59,3176.59,3175.4,3178.65,3180.7,3180.8,3175.26,3174.02,3171.48,3170.54,3169.6,3174.13,3168.24,3168.18,3168.56,3171.43,3170.83,3167.07,3166.14,3168.79,3168.56,3168.045,3167.53,3157.82,3160.62,3158.82,3162.04,3162.42,3165.13,3168.49,3170.16,3172.08,3168.61,3171.6850000000004,3174.76,3175.4,3176.18,3178.14,3171.97,3165,3164.72,3165.72,3168.61,3168.68,3169,3170.49,3171.98,3175.08,3172.8,3169.6,3161.11,3162.15,3163.59,3165.2,3165.96,3163.52,3157.41,3152.4049999999997,3147.4,3152.69,3160.62,3162.63,3165.59,3163.74,3162.21,3157.21,3156.8,3152.41,3141.4,3145.0699999999997,3148.74,3147.13,3150.73,3146.63,3147.48,3154.19,3151.79,3153.23,3151,3144.39,3153.01,3151.11,3149.21,3154.03,3159.41,3165.43,3157.38,3155.76,3156.98,3157.86,3161.79,3161.15,3159.18,3153.685,3148.19,3138.1,3137.01,3136.75,3141.8,3142.82,3132.55,3118.6,3125.36,3134.59,3132.78,3136.005,3139.23,3139.81,3136.38,3136.84,3139.5,3138.43,3137.42,3142.81,3143.78,3145,3148.99,3145.33,3141.67,3142.32,3146.26,3141.53,3144.99,3147.49,3144.45,3146,3145.98,3144.4,3145.18,3148.91,3152.64,3154.8,3149.34,3147.39,3147.6,3149.63,3152.6,3151.5,3151.93,3149.67,3147.88,3146.065,3144.25,3141.71,3142.24,3147.8,3145.62,3144.83,3142.6,3141,3140.23,3140.94,3145.88,3151.84,3157.8,3168.21,3164.41,3159.5,3157.5,3156.62,3153.99,3145.3,3147.58,3149.04,3150.54,3147.15,3143.76,3163.02,3163,3159.15,3158.31,3157.4,3155.99,3162.36,3161.22,3159.38,3155.65,3155.465,3155.28,3149.9,3146.86,3147.59,3144.44,3149.05,3143.95,3146.49,3148.2,3147.02,3146.93,3148.89,3150.85,3158.52,3162.78,3165.1,3159.14,3158.2,3148.66,3147.59,3147.87,3150.56,3152.2,3150.335,3148.47,3146.16,3155.57,3168.74,3187.46,3153.97,3152.84,3142,3150.84,3148.43,3139.62,3140.94] \ No newline at end of file diff --git a/src/strategies/strategy/rl-dqn/reinforcement-Learning.spec.ts b/src/strategies/strategy/rl-dqn/reinforcement-Learning.spec.ts index c585a92..974a5ef 100644 --- a/src/strategies/strategy/rl-dqn/reinforcement-Learning.spec.ts +++ b/src/strategies/strategy/rl-dqn/reinforcement-Learning.spec.ts @@ -30,7 +30,12 @@ describe('RL test', () => { [1, 0], [1, 1], ]); - const ys = tf.tensor2d([[0], [1], [1], [0]]); + const ys = tf.tensor2d([ + [0, 1], + [1, 0], + [1, 0], + [0, 1], + ]); // Modify the target tensor shape // Train the model model.fit(xs, ys, { epochs: 100 }).then(() => { diff --git a/src/strategies/strategy/rl-dqn/train.ts b/src/strategies/strategy/rl-dqn/train.ts index c72c3d8..a4f48e1 100644 --- a/src/strategies/strategy/rl-dqn/train.ts +++ b/src/strategies/strategy/rl-dqn/train.ts @@ -46,11 +46,11 @@ export async function train( const averageReward100 = rewardAverager100.average(); if (averageReward100 > averageReward100Best) { averageReward100Best = averageReward100; - if (savePath != null) { - await agent.onlineNetwork.save( - 'file://src/strategies/strategy/rl-dqn/models/dqn', - ); - } + // if (savePath != null) { + // await agent.onlineNetwork.save( + // 'file://src/strategies/strategy/rl-dqn/models/dqn', + // ); + // } } syncCount++; return agent.cumulativeReward_;