Skip to content

A
ai
Commit f9e59bd7 authored by Ahmad Nemati's avatar Ahmad Nemati
Browse files
Options

git pull

parent 54978279
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 208 deletions
bad.txt
View file @ f9e59bd7
......@@ -3,7 +3,7 @@
"date": "2021-10-24",
"profit": -1.35,
"count": 2,
"longCount": 2,
"longCount": 1,
"shortCount": 1,
"longProfit": -1.11,
"shortProfit": -0.24000000000000002,
......@@ -11,21 +11,21 @@
},
{
"date": "2021-10-25",
"profit": 0.040000000000000036,
"profit": 0.04000000000000006,
"count": 3,
"longCount": 1,
"shortCount": 3,
"longProfit": 0,
"shortProfit": 0.040000000000000036,
"shortProfit": 0.04000000000000006,
"balance": 4998.69
},
{
"date": "2021-10-26",
"profit": -3.3300000000000005,
"profit": -3.330000000000001,
"count": 11,
"longCount": 11,
"shortCount": 0,
"longProfit": -3.3300000000000005,
"longProfit": -3.330000000000001,
"shortProfit": 0,
"balance": 4995.36
},
......@@ -41,19 +41,19 @@
},
{
"date": "2021-10-28",
"profit": -37.20999999999999,
"profit": -37.209999999999994,
"count": 18,
"longCount": 5,
"shortCount": 14,
"longProfit": -18.56,
"shortProfit": -18.64999999999999,
"shortProfit": -18.649999999999995,
"balance": 4959.629999999999
},
{
"date": "2021-10-29",
"profit": -11.42,
"count": 7,
"longCount": 2,
"longCount": 3,
"shortCount": 5,
"longProfit": -2.58,
"shortProfit": -8.84,
......@@ -61,7 +61,7 @@
},
{
"date": "2021-10-30",
"profit": -32.529999999999994,
"profit": -32.53,
"count": 42,
"longCount": 21,
"shortCount": 21,
......@@ -71,51 +71,51 @@
},
{
"date": "2021-10-31",
"profit": -30.23,
"profit": -30.229999999999993,
"count": 47,
"longCount": 28,
"longCount": 29,
"shortCount": 19,
"longProfit": -26.049999999999997,
"shortProfit": -4.179999999999999,
"longProfit": -26.049999999999994,
"shortProfit": -4.18,
"balance": 4885.45
},
{
"date": "2021-11-01",
"profit": -165.52999999999992,
"profit": -165.52999999999994,
"count": 95,
"longCount": 52,
"shortCount": 43,
"longProfit": -72.39000000000003,
"shortProfit": -93.14000000000001,
"longProfit": -72.39,
"shortProfit": -93.14,
"balance": 4719.92
},
{
"date": "2021-11-02",
"profit": 2.8999999999999986,
"profit": 2.8999999999999995,
"count": 43,
"longCount": 17,
"shortCount": 27,
"longProfit": 27.209999999999997,
"shortProfit": -24.309999999999995,
"shortProfit": -24.310000000000002,
"balance": 4722.82
},
{
"date": "2021-11-03",
"profit": 13.770000000000003,
"profit": 13.77,
"count": 16,
"longCount": 15,
"shortCount": 1,
"longProfit": 16.020000000000003,
"longProfit": 16.02,
"shortProfit": -2.25,
"balance": 4736.59
},
{
"date": "2021-11-04",
"profit": -12.29,
"profit": -12.290000000000001,
"count": 15,
"longCount": 14,
"shortCount": 1,
"longProfit": -11.23,
"longProfit": -11.230000000000002,
"shortProfit": -1.06,
"balance": 4724.3
},
......@@ -126,14 +126,14 @@
"longCount": 7,
"shortCount": 6,
"longProfit": -11.59,
"shortProfit": -7.19,
"shortProfit": -7.190000000000001,
"balance": 4705.52
},
{
"date": "2021-11-06",
"profit": -11.120000000000001,
"count": 17,
"longCount": 6,
"longCount": 5,
"shortCount": 12,
"longProfit": -5.91,
"shortProfit": -5.209999999999999,
......@@ -141,31 +141,31 @@
},
{
"date": "2021-11-07",
"profit": -15.150000000000002,
"profit": -15.15,
"count": 27,
"longCount": 4,
"longCount": 5,
"shortCount": 23,
"longProfit": 3.31,
"shortProfit": -18.459999999999997,
"longProfit": 3.3099999999999996,
"shortProfit": -18.46,
"balance": 4679.250000000001
},
{
"date": "2021-11-08",
"profit": 30.030000000000005,
"profit": 30.03,
"count": 6,
"longCount": 6,
"shortCount": 0,
"longProfit": 30.030000000000005,
"longProfit": 30.03,
"shortProfit": 0,
"balance": 4709.280000000001
},
{
"date": "2021-11-09",
"profit": 115.62,
"profit": 115.61999999999999,
"count": 13,
"longCount": 13,
"shortCount": 0,
"longProfit": 115.62,
"longProfit": 115.61999999999999,
"shortProfit": 0,
"balance": 4824.900000000001
},
......@@ -181,9 +181,9 @@
},
{
"date": "2021-11-11",
"profit": 31.720000000000002,
"profit": 31.72,
"count": 8,
"longCount": 6,
"longCount": 5,
"shortCount": 3,
"longProfit": 23.310000000000002,
"shortProfit": 8.41,
......@@ -211,9 +211,9 @@
},
{
"date": "2021-11-14",
"profit": -26.699999999999996,
"profit": -26.7,
"count": 17,
"longCount": 9,
"longCount": 10,
"shortCount": 8,
"longProfit": -13.290000000000001,
"shortProfit": -13.41,
......@@ -221,9 +221,9 @@
},
{
"date": "2021-11-15",
"profit": -44.410000000000004,
"profit": -44.41,
"count": 28,
"longCount": 19,
"longCount": 18,
"shortCount": 10,
"longProfit": -22.39,
"shortProfit": -22.02,
......@@ -241,12 +241,12 @@
},
{
"date": "2021-11-17",
"profit": 70.63000000000001,
"profit": 70.63,
"count": 10,
"longCount": 1,
"shortCount": 10,
"longProfit": 0,
"shortProfit": 70.63000000000001,
"shortProfit": 70.63,
"balance": 4915.4000000000015
},
{
......@@ -281,7 +281,7 @@
},
{
"date": "2021-11-21",
"profit": 13.66,
"profit": 13.660000000000004,
"count": 11,
"longCount": 6,
"shortCount": 6,
......@@ -291,12 +291,12 @@
},
{
"date": "2021-11-22",
"profit": -11.97,
"profit": -11.970000000000002,
"count": 12,
"longCount": 4,
"shortCount": 9,
"longProfit": -8.399999999999999,
"shortProfit": -3.5700000000000003,
"longProfit": -8.4,
"shortProfit": -3.5700000000000007,
"balance": 4996.280000000001
},
{
......@@ -311,9 +311,9 @@
},
{
"date": "2021-11-24",
"profit": -7.69,
"profit": -7.6899999999999995,
"count": 4,
"longCount": 3,
"longCount": 2,
"shortCount": 2,
"longProfit": -4.86,
"shortProfit": -2.83,
......@@ -321,12 +321,12 @@
},
{
"date": "2021-11-25",
"profit": -12.18,
"profit": -12.180000000000001,
"count": 15,
"longCount": 3,
"shortCount": 12,
"longProfit": -0.12,
"shortProfit": -12.060000000000002,
"shortProfit": -12.06,
"balance": 4977.080000000001
},
{
......@@ -341,12 +341,12 @@
},
{
"date": "2021-11-27",
"profit": 44.63000000000001,
"profit": 44.63,
"count": 8,
"longCount": 1,
"shortCount": 8,
"longProfit": 0,
"shortProfit": 44.63000000000001,
"shortProfit": 44.63,
"balance": 5014.350000000001
},
{
......@@ -375,7 +375,7 @@
"count": 5,
"longCount": 4,
"shortCount": 1,
"longProfit": -7.580000000000002,
"longProfit": -7.58,
"shortProfit": -2.02,
"balance": 5059.410000000001
},
......@@ -383,9 +383,9 @@
"date": "2021-12-02",
"profit": -9.39,
"count": 6,
"longCount": 4,
"longCount": 3,
"shortCount": 3,
"longProfit": -5.5200000000000005,
"longProfit": -5.52,
"shortProfit": -3.87,
"balance": 5050.02
},
......@@ -393,7 +393,7 @@
"date": "2021-12-03",
"profit": -37.06999999999999,
"count": 38,
"longCount": 25,
"longCount": 24,
"shortCount": 14,
"longProfit": -28.2,
"shortProfit": -8.870000000000001,
......@@ -401,12 +401,12 @@
},
{
"date": "2021-12-04",
"profit": 173.64,
"profit": 173.64000000000001,
"count": 13,
"longCount": 1,
"shortCount": 13,
"longProfit": 0,
"shortProfit": 173.64,
"shortProfit": 173.64000000000001,
"balance": 5186.590000000001
},
{
......@@ -423,19 +423,19 @@
"date": "2021-12-06",
"profit": 54.370000000000005,
"count": 32,
"longCount": 11,
"longCount": 10,
"shortCount": 22,
"longProfit": -18.95,
"longProfit": -18.950000000000003,
"shortProfit": 73.32,
"balance": 5330.910000000001
},
{
"date": "2021-12-07",
"profit": 29.609999999999996,
"profit": 29.61,
"count": 9,
"longCount": 9,
"shortCount": 0,
"longProfit": 29.609999999999996,
"longProfit": 29.61,
"shortProfit": 0,
"balance": 5360.52
},
......@@ -461,7 +461,7 @@
},
{
"date": "2021-12-10",
"profit": -14.41,
"profit": -14.410000000000002,
"count": 5,
"longCount": 4,
"shortCount": 1,
......@@ -471,22 +471,22 @@
},
{
"date": "2021-12-11",
"profit": -5.04,
"profit": -5.040000000000001,
"count": 8,
"longCount": 1,
"shortCount": 8,
"longProfit": 0,
"shortProfit": -5.04,
"shortProfit": -5.040000000000001,
"balance": 5329.740000000001
},
{
"date": "2021-12-12",
"profit": -11.45,
"count": 6,
"longCount": 2,
"longCount": 1,
"shortCount": 5,
"longProfit": -0.04000000000000001,
"shortProfit": -11.41,
"shortProfit": -11.409999999999998,
"balance": 5318.290000000001
},
{
......@@ -511,17 +511,17 @@
},
{
"date": "2021-12-15",
"profit": -19.890000000000004,
"profit": -19.89,
"count": 18,
"longCount": 2,
"longCount": 3,
"shortCount": 16,
"longProfit": -2.99,
"shortProfit": -16.900000000000002,
"shortProfit": -16.9,
"balance": 5305.93
},
{
"date": "2021-12-16",
"profit": -31.670000000000005,
"profit": -31.67000000000001,
"count": 19,
"longCount": 17,
"shortCount": 2,
......@@ -531,12 +531,12 @@
},
{
"date": "2021-12-18",
"profit": 51.49,
"profit": 51.49000000000001,
"count": 18,
"longCount": 1,
"shortCount": 18,
"longProfit": 0,
"shortProfit": 51.49,
"shortProfit": 51.49000000000001,
"balance": 5325.75
},
{
......@@ -546,27 +546,27 @@
"longCount": 12,
"shortCount": 8,
"longProfit": -22.14,
"shortProfit": -0.3899999999999997,
"shortProfit": -0.3899999999999998,
"balance": 5303.22
},
{
"date": "2021-12-20",
"profit": -12.240000000000002,
"count": 11,
"longCount": 6,
"longCount": 5,
"shortCount": 6,
"longProfit": -11.44,
"shortProfit": -0.8000000000000003,
"longProfit": -11.440000000000001,
"shortProfit": -0.7999999999999999,
"balance": 5290.9800000000005
},
{
"date": "2021-12-21",
"profit": -25.569999999999997,
"profit": -25.57,
"count": 13,
"longCount": 1,
"shortCount": 13,
"longProfit": 0,
"shortProfit": -25.569999999999997,
"shortProfit": -25.57,
"balance": 5265.410000000001
},
{
......@@ -581,11 +581,11 @@
},
{
"date": "2021-12-23",
"profit": 1.83,
"profit": 1.8299999999999996,
"count": 8,
"longCount": 6,
"longCount": 5,
"shortCount": 3,
"longProfit": 8.39,
"longProfit": 8.389999999999999,
"shortProfit": -6.5600000000000005,
"balance": 5299.02
},
......@@ -611,7 +611,7 @@
},
{
"date": "2021-12-27",
"profit": 1.13,
"profit": 1.1300000000000003,
"count": 13,
"longCount": 9,
"shortCount": 4,
......@@ -641,12 +641,12 @@
},
{
"date": "2021-12-30",
"profit": 44.96000000000001,
"profit": 44.96,
"count": 8,
"longCount": 1,
"shortCount": 8,
"longProfit": 0,
"shortProfit": 44.96000000000001,
"shortProfit": 44.96,
"balance": 5422.34
},
{
......@@ -671,12 +671,12 @@
},
{
"date": "2022-01-02",
"profit": -15.56,
"profit": -15.560000000000002,
"count": 9,
"longCount": 5,
"shortCount": 4,
"longProfit": -9.34,
"shortProfit": -6.220000000000001,
"shortProfit": -6.22,
"balance": 5406.93
},
{
......@@ -686,26 +686,26 @@
"longCount": 19,
"shortCount": 9,
"longProfit": -22.57,
"shortProfit": -9.309999999999999,
"shortProfit": -9.31,
"balance": 5375.05
},
{
"date": "2022-01-04",
"profit": -66.83000000000003,
"profit": -66.83000000000001,
"count": 54,
"longCount": 30,
"shortCount": 25,
"longProfit": -65.22000000000003,
"shortProfit": -1.6099999999999994,
"longProfit": -65.22000000000001,
"shortProfit": -1.6099999999999999,
"balance": 5308.22
},
{
"date": "2022-01-05",
"profit": -140.82999999999998,
"count": 96,
"longCount": 50,
"longCount": 49,
"shortCount": 47,
"longProfit": -68.57000000000001,
"longProfit": -68.56999999999998,
"shortProfit": -72.26000000000002,
"balance": 5167.39
},
......@@ -721,22 +721,22 @@
},
{
"date": "2022-01-08",
"profit": 113.95000000000002,
"profit": 113.95,
"count": 15,
"longCount": 1,
"shortCount": 15,
"longProfit": 0,
"shortProfit": 113.95000000000002,
"shortProfit": 113.95,
"balance": 5333.17
},
{
"date": "2022-01-09",
"profit": 153.25,
"profit": 153.25000000000003,
"count": 20,
"longCount": 1,
"shortCount": 20,
"longProfit": 0,
"shortProfit": 153.25,
"shortProfit": 153.25000000000003,
"balance": 5486.42
},
{
......@@ -781,9 +781,9 @@
},
{
"date": "2022-01-14",
"profit": -3.49,
"profit": -3.4900000000000007,
"count": 6,
"longCount": 4,
"longCount": 3,
"shortCount": 3,
"longProfit": -0.27000000000000024,
"shortProfit": -3.22,
......@@ -793,19 +793,19 @@
"date": "2022-01-15",
"profit": -8.000000000000002,
"count": 10,
"longCount": 6,
"longCount": 5,
"shortCount": 5,
"longProfit": -2.21,
"shortProfit": -5.79,
"shortProfit": -5.790000000000001,
"balance": 5471.72
},
{
"date": "2022-01-16",
"profit": -20.019999999999996,
"profit": -20.02,
"count": 19,
"longCount": 10,
"shortCount": 9,
"longProfit": -10.64,
"longProfit": -10.639999999999999,
"shortProfit": -9.38,
"balance": 5451.7
},
......@@ -821,32 +821,32 @@
},
{
"date": "2022-01-18",
"profit": 16.069999999999997,
"profit": 16.07,
"count": 11,
"longCount": 1,
"shortCount": 11,
"longProfit": 0,
"shortProfit": 16.069999999999997,
"shortProfit": 16.07,
"balance": 5453.82
},
{
"date": "2022-01-19",
"profit": -37.56,
"profit": -37.559999999999995,
"count": 31,
"longCount": 16,
"shortCount": 15,
"longProfit": -26.930000000000003,
"longProfit": -26.93,
"shortProfit": -10.63,
"balance": 5416.259999999999
},
{
"date": "2022-01-20",
"profit": -61.00999999999999,
"profit": -61.010000000000005,
"count": 33,
"longCount": 22,
"shortCount": 11,
"longProfit": -48.95999999999999,
"shortProfit": -12.05,
"longProfit": -48.96,
"shortProfit": -12.050000000000002,
"balance": 5355.249999999999
},
{
......@@ -861,9 +861,9 @@
},
{
"date": "2022-01-24",
"profit": 109.27000000000001,
"profit": 109.27,
"count": 15,
"longCount": 1,
"longCount": 2,
"shortCount": 14,
"longProfit": -3.0500000000000003,
"shortProfit": 112.32000000000001,
......@@ -906,17 +906,17 @@
"longCount": 4,
"shortCount": 10,
"longProfit": 0.6599999999999999,
"shortProfit": -14.000000000000002,
"shortProfit": -14,
"balance": 5616.509999999998
},
{
"date": "2022-01-30",
"profit": -31.40000000000002,
"profit": -31.40000000000001,
"count": 39,
"longCount": 19,
"shortCount": 21,
"longProfit": -6.760000000000001,
"shortProfit": -24.64,
"longProfit": -6.760000000000002,
"shortProfit": -24.640000000000004,
"balance": 5585.109999999999
},
{
......@@ -925,23 +925,23 @@
"count": 60,
"longCount": 25,
"shortCount": 35,
"longProfit": -58.46999999999999,
"shortProfit": -45.19999999999998,
"longProfit": -58.47,
"shortProfit": -45.2,
"balance": 5481.439999999999
},
{
"date": "2022-02-01",
"profit": 18.23,
"profit": 18.229999999999997,
"count": 10,
"longCount": 10,
"shortCount": 0,
"longProfit": 18.23,
"longProfit": 18.229999999999997,
"shortProfit": 0,
"balance": 5499.669999999998
},
{
"date": "2022-02-02",
"profit": 2.049999999999999,
"profit": 2.0500000000000016,
"count": 30,
"longCount": 27,
"shortCount": 3,
......@@ -981,11 +981,11 @@
},
{
"date": "2022-02-08",
"profit": 151.74000000000004,
"profit": 151.74,
"count": 11,
"longCount": 11,
"shortCount": 0,
"longProfit": 151.74000000000004,
"longProfit": 151.74,
"shortProfit": 0,
"balance": 5700.179999999998
},
......@@ -993,7 +993,7 @@
"date": "2022-02-10",
"profit": -131.99,
"count": 93,
"longCount": 52,
"longCount": 51,
"shortCount": 42,
"longProfit": -29.680000000000014,
"shortProfit": -102.30999999999999,
......@@ -1001,19 +1001,19 @@
},
{
"date": "2022-02-11",
"profit": -75.67,
"profit": -75.66999999999999,
"count": 32,
"longCount": 18,
"longCount": 19,
"shortCount": 14,
"longProfit": -82.36999999999998,
"shortProfit": 6.700000000000001,
"shortProfit": 6.7,
"balance": 5492.519999999998
},
{
"date": "2022-02-12",
"profit": 13.260000000000002,
"profit": 13.26,
"count": 16,
"longCount": 5,
"longCount": 4,
"shortCount": 12,
"longProfit": -6.4,
"shortProfit": 19.66,
......@@ -1021,22 +1021,22 @@
},
{
"date": "2022-02-13",
"profit": -14.94,
"profit": -14.940000000000001,
"count": 21,
"longCount": 11,
"shortCount": 11,
"longProfit": -11.71,
"shortProfit": -3.230000000000001,
"shortProfit": -3.2300000000000004,
"balance": 5490.839999999998
},
{
"date": "2022-02-14",
"profit": -31.699999999999985,
"profit": -31.7,
"count": 45,
"longCount": 12,
"longCount": 13,
"shortCount": 33,
"longProfit": -10,
"shortProfit": -21.7,
"shortProfit": -21.700000000000003,
"balance": 5459.1399999999985
},
{
......@@ -1061,11 +1061,11 @@
},
{
"date": "2022-02-17",
"profit": 9.849999999999998,
"profit": 9.85,
"count": 15,
"longCount": 15,
"shortCount": 0,
"longProfit": 9.849999999999998,
"longProfit": 9.85,
"shortProfit": 0,
"balance": 5512.119999999999
},
......@@ -1073,7 +1073,7 @@
"date": "2022-02-19",
"profit": 5.25,
"count": 4,
"longCount": 3,
"longCount": 2,
"shortCount": 2,
"longProfit": -1.43,
"shortProfit": 6.680000000000001,
......@@ -1121,9 +1121,9 @@
},
{
"date": "2022-02-26",
"profit": -6.69,
"profit": -6.6899999999999995,
"count": 4,
"longCount": 2,
"longCount": 1,
"shortCount": 3,
"longProfit": -1.02,
"shortProfit": -5.67,
......@@ -1131,7 +1131,7 @@
},
{
"date": "2022-02-27",
"profit": -75.38,
"profit": -75.38000000000001,
"count": 39,
"longCount": 23,
"shortCount": 17,
......@@ -1141,17 +1141,17 @@
},
{
"date": "2022-02-28",
"profit": -31.21,
"profit": -31.210000000000008,
"count": 19,
"longCount": 1,
"shortCount": 19,
"longProfit": 0,
"shortProfit": -31.21,
"shortProfit": -31.210000000000008,
"balance": 5569.429999999999
},
{
"date": "2022-03-02",
"profit": 22.689999999999998,
"profit": 22.69,
"count": 4,
"longCount": 3,
"shortCount": 2,
......@@ -1166,17 +1166,17 @@
"longCount": 29,
"shortCount": 5,
"longProfit": 132.09,
"shortProfit": -2.3600000000000003,
"shortProfit": -2.36,
"balance": 5721.8499999999985
},
{
"date": "2022-03-04",
"profit": 8.24,
"profit": 8.239999999999998,
"count": 3,
"longCount": 1,
"shortCount": 3,
"longProfit": 0,
"shortProfit": 8.24,
"shortProfit": 8.239999999999998,
"balance": 5730.089999999998
},
{
......@@ -1213,10 +1213,10 @@
"date": "2022-03-08",
"profit": -25.38,
"count": 13,
"longCount": 8,
"longCount": 7,
"shortCount": 6,
"longProfit": -12.309999999999999,
"shortProfit": -13.070000000000002,
"longProfit": -12.31,
"shortProfit": -13.07,
"balance": 5797.109999999998
},
{
......@@ -1231,11 +1231,11 @@
},
{
"date": "2022-03-10",
"profit": 77.31,
"profit": 77.30999999999999,
"count": 14,
"longCount": 14,
"shortCount": 0,
"longProfit": 77.31,
"longProfit": 77.30999999999999,
"shortProfit": 0,
"balance": 5878.609999999998
},
......@@ -1261,31 +1261,31 @@
},
{
"date": "2022-03-13",
"profit": -12.419999999999998,
"profit": -12.42,
"count": 18,
"longCount": 13,
"longCount": 14,
"shortCount": 5,
"longProfit": -9.219999999999999,
"shortProfit": -3.1999999999999993,
"shortProfit": -3.1999999999999997,
"balance": 5840.079999999998
},
{
"date": "2022-03-14",
"profit": -15.219999999999999,
"profit": -15.219999999999997,
"count": 28,
"longCount": 4,
"shortCount": 25,
"longProfit": -3.4400000000000004,
"shortProfit": -11.779999999999998,
"shortProfit": -11.780000000000003,
"balance": 5824.859999999998
},
{
"date": "2022-03-15",
"profit": -78.13000000000002,
"profit": -78.13000000000001,
"count": 45,
"longCount": 22,
"shortCount": 23,
"longProfit": -39.11,
"longProfit": -39.10999999999999,
"shortProfit": -39.019999999999996,
"balance": 5746.729999999998
},
......@@ -1301,12 +1301,12 @@
},
{
"date": "2022-03-17",
"profit": -20.840000000000007,
"profit": -20.840000000000003,
"count": 19,
"longCount": 8,
"shortCount": 11,
"longProfit": -9.100000000000001,
"shortProfit": -11.74,
"shortProfit": -11.739999999999998,
"balance": 5716.779999999998
},
{
......@@ -1315,8 +1315,8 @@
"count": 64,
"longCount": 36,
"shortCount": 28,
"longProfit": 29.87,
"shortProfit": -24.27,
"longProfit": 29.870000000000005,
"shortProfit": -24.270000000000003,
"balance": 5722.379999999998
},
{
......@@ -1341,7 +1341,7 @@
},
{
"date": "2022-03-21",
"profit": -9.270000000000001,
"profit": -9.27,
"count": 9,
"longCount": 4,
"shortCount": 5,
......@@ -1351,22 +1351,22 @@
},
{
"date": "2022-03-22",
"profit": 3.2900000000000005,
"profit": 3.289999999999999,
"count": 17,
"longCount": 8,
"longCount": 7,
"shortCount": 10,
"longProfit": 12.939999999999998,
"longProfit": 12.94,
"shortProfit": -9.65,
"balance": 5775.919999999997
},
{
"date": "2022-03-23",
"profit": -7.59,
"profit": -7.590000000000001,
"count": 12,
"longCount": 6,
"shortCount": 6,
"longProfit": 2.4699999999999998,
"shortProfit": -10.059999999999999,
"shortProfit": -10.060000000000002,
"balance": 5768.329999999997
},
{
......@@ -1391,9 +1391,9 @@
},
{
"date": "2022-03-27",
"profit": 2.87,
"profit": 2.8699999999999997,
"count": 4,
"longCount": 3,
"longCount": 2,
"shortCount": 2,
"longProfit": 4.11,
"shortProfit": -1.24,
......@@ -1415,17 +1415,17 @@
"count": 9,
"longCount": 6,
"shortCount": 3,
"longProfit": 16.14,
"longProfit": 16.139999999999997,
"shortProfit": -3.08,
"balance": 5795.269999999997
},
{
"date": "2022-03-31",
"profit": 88.92999999999999,
"profit": 88.93,
"count": 27,
"longCount": 20,
"longCount": 21,
"shortCount": 7,
"longProfit": 93.49,
"longProfit": 93.49000000000001,
"shortProfit": -4.56,
"balance": 5884.199999999997
},
......@@ -1461,9 +1461,9 @@
},
{
"date": "2022-04-04",
"profit": -21.88,
"profit": -21.880000000000003,
"count": 14,
"longCount": 5,
"longCount": 4,
"shortCount": 10,
"longProfit": -7.1899999999999995,
"shortProfit": -14.690000000000001,
......@@ -1473,20 +1473,20 @@
"date": "2022-04-05",
"profit": -25.580000000000005,
"count": 17,
"longCount": 15,
"longCount": 16,
"shortCount": 2,
"longProfit": -21.520000000000007,
"longProfit": -21.520000000000003,
"shortProfit": -4.0600000000000005,
"balance": 5865.619999999997
},
{
"date": "2022-04-07",
"profit": 26.810000000000002,
"profit": 26.81,
"count": 5,
"longCount": 1,
"shortCount": 5,
"longProfit": 0,
"shortProfit": 26.810000000000002,
"shortProfit": 26.81,
"balance": 5892.429999999998
},
{
......@@ -1515,8 +1515,8 @@
"count": 59,
"longCount": 31,
"shortCount": 28,
"longProfit": -12.910000000000002,
"shortProfit": 76.92,
"longProfit": -12.91,
"shortProfit": 76.91999999999999,
"balance": 5969.039999999998
},
{
......@@ -1531,12 +1531,12 @@
},
{
"date": "2022-04-12",
"profit": 86.12999999999998,
"profit": 86.13,
"count": 15,
"longCount": 1,
"shortCount": 15,
"longProfit": 0,
"shortProfit": 86.12999999999998,
"shortProfit": 86.13,
"balance": 6055.029999999998
},
{
......@@ -1553,7 +1553,7 @@
"date": "2022-04-15",
"profit": 0.5599999999999998,
"count": 5,
"longCount": 2,
"longCount": 1,
"shortCount": 4,
"longProfit": -0.49,
"shortProfit": 1.05,
......@@ -1565,35 +1565,35 @@
"count": 16,
"longCount": 8,
"shortCount": 8,
"longProfit": -5.24,
"longProfit": -5.240000000000001,
"shortProfit": -4.18,
"balance": 6075.969999999998
},
{
"date": "2022-04-17",
"profit": -32.13,
"profit": -32.129999999999995,
"count": 45,
"longCount": 29,
"shortCount": 16,
"longProfit": -21.330000000000005,
"shortProfit": -10.799999999999999,
"longProfit": -21.33,
"shortProfit": -10.8,
"balance": 6043.839999999998
},
{
"date": "2022-04-18",
"profit": 12.090000000000003,
"profit": 12.090000000000002,
"count": 23,
"longCount": 1,
"shortCount": 23,
"longProfit": 0,
"shortProfit": 12.090000000000003,
"shortProfit": 12.090000000000002,
"balance": 6055.9299999999985
},
{
"date": "2022-04-20",
"profit": 2.07,
"count": 2,
"longCount": 2,
"longCount": 1,
"shortCount": 1,
"longProfit": 2.55,
"shortProfit": -0.48,
......@@ -1613,7 +1613,7 @@
"date": "2022-04-25",
"profit": 0.31999999999999984,
"count": 5,
"longCount": 2,
"longCount": 1,
"shortCount": 4,
"longProfit": -0.69,
"shortProfit": 1.0099999999999998,
......@@ -1645,17 +1645,17 @@
"count": 14,
"longCount": 6,
"shortCount": 9,
"longProfit": -3.6500000000000004,
"longProfit": -3.65,
"shortProfit": -14.700000000000001,
"balance": 6058.899999999997
},
{
"date": "2022-04-29",
"profit": -20.44,
"profit": -20.440000000000005,
"count": 13,
"longCount": 13,
"shortCount": 0,
"longProfit": -20.44,
"longProfit": -20.440000000000005,
"shortProfit": 0,
"balance": 6038.459999999997
},
......
final1000.js
View file @ f9e59bd7
......@@ -129,16 +129,19 @@ async function run(root,name, directory, timestamp) {
}
let newLast=[]
let jj='['
for (let i=0;i<las.length;i++)
{
let f={closeDate:las[i].closeDate,profitLossString:las[i].profitLossString,sideString:las[i].sideString}
newLast.push(f)
let inline='{"closeDate":"'+las[i].closeDate+'","profitLossString":"'+las[i].profitLossString+'","sideString":"'+las[i].sideString+'"}'
if (i !==(las.length-1))
inline=inline+','
jj=jj+inline
}
console.log(las.length)
jj=jj+']'
//console.log(las.length)
createfileADV(root,timestamp, name, JSON.stringify(newLast, null, 2))
createfileADV(root,timestamp, name, jj)
last = []
}
......
test_json.js
View file @ f9e59bd7
......@@ -54,19 +54,41 @@ let fs = require('fs')
// });
// }
let year = ['2017', '2018', '2019', '2020', '2021', '2022']
let month = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
// let year = ['2017', '2018', '2019', '2020', '2021', '2022']
// let month = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
//
//
// let dates = []
// for (let i = 0; i < year.length; i++) {
// for (let j = 0; j < month.length; j++) {
// let t = year[i] + '-' + month[j]
// if (!(t === '2017-01' || t === '2017-02' || t === '2017-03' || t === '2017-04' || t === '2017-05' || t === '2017-06' || t === '2017-07' || t === '2022-05' ||t === '2022-06' || t === '2022-07' || t === '2022-08' || t === '2022-09' || t === '2022-10' || t === '2022-11' || t === '2022-12'))
// dates.push(t)
// }
// }
// let t={closeDate:"1",profitLossString:"2",sideString:"3"}
// let arr=[]
// arr.push(t)
// arr.push(t)
// console.log(JSON.stringify(arr))
let dates = []
for (let i = 0; i < year.length; i++) {
for (let j = 0; j < month.length; j++) {
let t = year[i] + '-' + month[j]
if (!(t === '2017-01' || t === '2017-02' || t === '2017-03' || t === '2017-04' || t === '2017-05' || t === '2017-06' || t === '2017-07' || t === '2022-05' ||t === '2022-06' || t === '2022-07' || t === '2022-08' || t === '2022-09' || t === '2022-10' || t === '2022-11' || t === '2022-12'))
dates.push(t)
test()
async function test()
{
let las = await fs.readFileSync('t.json', 'utf8');
las=JSON.parse(las)
let jj='['
for (let i=0;i<las.length;i++)
{
let inline='{"closeDate":"'+las[i].closeDate+'","profitLossString":"'+las[i].profitLossString+'","sideString":"'+las[i].sideString+'"}'
if (i !==(las.length-1))
inline=inline+','
jj=jj+inline
}
jj=jj+']'
console.log(JSON.parse(jj))
}
console.log(arr)
//
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment