Skip to content

Commit f354d9e

Browse files
authored
Update search_and_matching.jl
1 parent 3a38eea commit f354d9e

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/markets/search_and_matching.jl

+17-17
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,10 @@ function perform_firms_market!(
345345
DM_nominal_ig = zeros(size(DM_d_ig))
346346

347347
# 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)
349349

350350
# 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)
352352

353353
# continue exchanges until either demand or supply terminates
354354

@@ -368,22 +368,22 @@ function perform_firms_market!(
368368
if S_fg[f] > DM_d_ig[i]
369369
S_fg[f] -= DM_d_ig[i]
370370
DM_nominal_ig[i] += DM_d_ig[i] * P_f[f]
371-
DM_d_ig[i] = 0
371+
DM_d_ig[i] = 0.0
372372
else
373373
DM_d_ig[i] -= S_fg[f]
374374
DM_nominal_ig[i] += S_fg[f] .* P_f[f]
375-
S_fg[f] = 0
375+
S_fg[f] = 0.0
376376
delete!(F_g_sampler, e)
377377
isempty(F_g_sampler) && break
378378
end
379379
end
380-
filter!(i -> DM_d_ig[i] > 0, I_g)
380+
filter!(i -> DM_d_ig[i] > 0.0, I_g)
381381
end
382382

383383
if !isempty(I_g)
384384
DM_d_ig_ = copy(DM_d_ig)
385385
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)
387387

388388
# weights according to size and price
389389
F_g_sampler = create_weighted_sampler(P_f, S_f, F_g)
@@ -398,16 +398,16 @@ function perform_firms_market!(
398398
if S_fg_[f] > DM_d_ig_[i]
399399
S_fg[f] -= DM_d_ig_[i]
400400
S_fg_[f] -= DM_d_ig_[i]
401-
DM_d_ig_[i] = 0
401+
DM_d_ig_[i] = 0.0
402402
else
403403
DM_d_ig_[i] -= S_fg_[f]
404404
S_fg[f] -= S_fg_[f]
405-
S_fg_[f] = 0
405+
S_fg_[f] = 0.0
406406
delete!(F_g_sampler, e)
407407
isempty(F_g_sampler) && break
408408
end
409409
end
410-
filter!(i -> DM_d_ig_[i] > 0, I_g)
410+
filter!(i -> DM_d_ig_[i] > 0.0, I_g)
411411
end
412412
end
413413

@@ -472,7 +472,7 @@ function perform_retail_market!(
472472
C_real_hg = zeros(size(C_d_hg))
473473
H_g = findall(C_d_hg .> 0.0)
474474

475-
filter!(i -> S_fg[i] > 0, F_g)
475+
filter!(i -> S_fg[i] > 0.0, F_g)
476476

477477
# weights according to size and price
478478
F_g_sampler = create_weighted_sampler(P_f, S_f, F_g)
@@ -487,22 +487,22 @@ function perform_retail_market!(
487487
if S_fg[f] > C_d_hg[h] / P_f[f]
488488
S_fg[f] -= C_d_hg[h] / P_f[f]
489489
C_real_hg[h] += C_d_hg[h] / P_f[f]
490-
C_d_hg[h] = 0
490+
C_d_hg[h] = 0.0
491491
else
492492
C_d_hg[h] -= S_fg[f] * P_f[f]
493493
C_real_hg[h] += S_fg[f]
494-
S_fg[f] = 0
494+
S_fg[f] = 0.0
495495
delete!(F_g_sampler, e)
496496
isempty(F_g_sampler) && break
497497
end
498498
end
499-
filter!(h -> C_d_hg[h] > 0, H_g)
499+
filter!(h -> C_d_hg[h] > 0.0, H_g)
500500
end
501501

502502
if !isempty(H_g)
503503
C_d_hg_ = copy(C_d_hg)
504504
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)
506506

507507
# weights according to size and price
508508
F_g_sampler = create_weighted_sampler(P_f, S_f, F_g)
@@ -517,16 +517,16 @@ function perform_retail_market!(
517517
if S_fg_[f] > C_d_hg_[h] / P_f[f]
518518
S_fg[f] -= C_d_hg_[h] / P_f[f]
519519
S_fg_[f] -= C_d_hg_[h] / P_f[f]
520-
C_d_hg_[h] = 0
520+
C_d_hg_[h] = 0.0
521521
else
522522
C_d_hg_[h] -= S_fg_[f] * P_f[f]
523523
S_fg[f] -= S_fg_[f]
524-
S_fg_[f] = 0
524+
S_fg_[f] = 0.0
525525
delete!(F_g_sampler, e)
526526
isempty(F_g_sampler) && break
527527
end
528528
end
529-
filter!(h -> C_d_hg_[h] > 0, H_g)
529+
filter!(h -> C_d_hg_[h] > 0.0, H_g)
530530
end
531531
end
532532

0 commit comments

Comments
 (0)