@@ -345,10 +345,10 @@ function perform_firms_market!(
345
345
DM_nominal_ig = zeros (size (DM_d_ig))
346
346
347
347
# firms that have demand for good "g" participate as buyers
348
- I_g = findall (DM_d_ig .> 0 )
348
+ I_g = findall (DM_d_ig .> 0.0 )
349
349
350
350
# keep firms that have positive stock of good "g"
351
- filter! (i -> S_fg[i] > 0 , F_g)
351
+ filter! (i -> S_fg[i] > 0.0 , F_g)
352
352
353
353
# continue exchanges until either demand or supply terminates
354
354
@@ -368,22 +368,22 @@ function perform_firms_market!(
368
368
if S_fg[f] > DM_d_ig[i]
369
369
S_fg[f] -= DM_d_ig[i]
370
370
DM_nominal_ig[i] += DM_d_ig[i] * P_f[f]
371
- DM_d_ig[i] = 0
371
+ DM_d_ig[i] = 0.0
372
372
else
373
373
DM_d_ig[i] -= S_fg[f]
374
374
DM_nominal_ig[i] += S_fg[f] .* P_f[f]
375
- S_fg[f] = 0
375
+ S_fg[f] = 0.0
376
376
delete! (F_g_sampler, e)
377
377
isempty (F_g_sampler) && break
378
378
end
379
379
end
380
- filter! (i -> DM_d_ig[i] > 0 , I_g)
380
+ filter! (i -> DM_d_ig[i] > 0.0 , I_g)
381
381
end
382
382
383
383
if ! isempty (I_g)
384
384
DM_d_ig_ = copy (DM_d_ig)
385
385
F_g = findall (G_f .== g)
386
- filter! (i -> S_fg_[i] > 0 && S_f[i] > 0 , F_g)
386
+ filter! (i -> S_fg_[i] > 0.0 && S_f[i] > 0. 0 , F_g)
387
387
388
388
# weights according to size and price
389
389
F_g_sampler = create_weighted_sampler (P_f, S_f, F_g)
@@ -398,16 +398,16 @@ function perform_firms_market!(
398
398
if S_fg_[f] > DM_d_ig_[i]
399
399
S_fg[f] -= DM_d_ig_[i]
400
400
S_fg_[f] -= DM_d_ig_[i]
401
- DM_d_ig_[i] = 0
401
+ DM_d_ig_[i] = 0.0
402
402
else
403
403
DM_d_ig_[i] -= S_fg_[f]
404
404
S_fg[f] -= S_fg_[f]
405
- S_fg_[f] = 0
405
+ S_fg_[f] = 0.0
406
406
delete! (F_g_sampler, e)
407
407
isempty (F_g_sampler) && break
408
408
end
409
409
end
410
- filter! (i -> DM_d_ig_[i] > 0 , I_g)
410
+ filter! (i -> DM_d_ig_[i] > 0.0 , I_g)
411
411
end
412
412
end
413
413
@@ -472,7 +472,7 @@ function perform_retail_market!(
472
472
C_real_hg = zeros (size (C_d_hg))
473
473
H_g = findall (C_d_hg .> 0.0 )
474
474
475
- filter! (i -> S_fg[i] > 0 , F_g)
475
+ filter! (i -> S_fg[i] > 0.0 , F_g)
476
476
477
477
# weights according to size and price
478
478
F_g_sampler = create_weighted_sampler (P_f, S_f, F_g)
@@ -487,22 +487,22 @@ function perform_retail_market!(
487
487
if S_fg[f] > C_d_hg[h] / P_f[f]
488
488
S_fg[f] -= C_d_hg[h] / P_f[f]
489
489
C_real_hg[h] += C_d_hg[h] / P_f[f]
490
- C_d_hg[h] = 0
490
+ C_d_hg[h] = 0.0
491
491
else
492
492
C_d_hg[h] -= S_fg[f] * P_f[f]
493
493
C_real_hg[h] += S_fg[f]
494
- S_fg[f] = 0
494
+ S_fg[f] = 0.0
495
495
delete! (F_g_sampler, e)
496
496
isempty (F_g_sampler) && break
497
497
end
498
498
end
499
- filter! (h -> C_d_hg[h] > 0 , H_g)
499
+ filter! (h -> C_d_hg[h] > 0.0 , H_g)
500
500
end
501
501
502
502
if ! isempty (H_g)
503
503
C_d_hg_ = copy (C_d_hg)
504
504
F_g = findall (G_f .== g)
505
- filter! (i -> S_fg_[i] > 0 && S_f[i] > 0 , F_g)
505
+ filter! (i -> S_fg_[i] > 0.0 && S_f[i] > 0. 0 , F_g)
506
506
507
507
# weights according to size and price
508
508
F_g_sampler = create_weighted_sampler (P_f, S_f, F_g)
@@ -517,16 +517,16 @@ function perform_retail_market!(
517
517
if S_fg_[f] > C_d_hg_[h] / P_f[f]
518
518
S_fg[f] -= C_d_hg_[h] / P_f[f]
519
519
S_fg_[f] -= C_d_hg_[h] / P_f[f]
520
- C_d_hg_[h] = 0
520
+ C_d_hg_[h] = 0.0
521
521
else
522
522
C_d_hg_[h] -= S_fg_[f] * P_f[f]
523
523
S_fg[f] -= S_fg_[f]
524
- S_fg_[f] = 0
524
+ S_fg_[f] = 0.0
525
525
delete! (F_g_sampler, e)
526
526
isempty (F_g_sampler) && break
527
527
end
528
528
end
529
- filter! (h -> C_d_hg_[h] > 0 , H_g)
529
+ filter! (h -> C_d_hg_[h] > 0.0 , H_g)
530
530
end
531
531
end
532
532
0 commit comments