From 4e3bd53d7f1ed35ead693a4d7ebb77ccfb1a7212 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Mon, 7 May 2012 11:54:24 +0200 Subject: [PATCH] moved reference propagation scripts --- .../test/reference/buildings_pathloss.m | 6 ++- .../test/reference/loss_ITU1238.m | 0 .../loss_ITU1411_NLOS_street_canyons.m | 37 ------------------- src/lte/test/reference/lte_pathloss.m | 6 ++- .../loss_COST231_large_cities_urban.m | 0 .../loss_COST231_small_cities_urban.m | 0 .../test/reference/loss_ITU1411_LOS.m | 0 .../loss_ITU1411_NLOS_over_rooftop.m | 0 .../test/reference/loss_OH_2_6GHz.m | 0 .../reference/loss_OH_large_cities_urban.m | 0 .../test/reference/loss_OH_openareas.m | 0 .../reference/loss_OH_small_cities_urban.m | 0 .../test/reference/loss_OH_suburban.m | 0 13 files changed, 10 insertions(+), 39 deletions(-) rename src/{lte => buildings}/test/reference/loss_ITU1238.m (100%) delete mode 100644 src/lte/test/reference/loss_ITU1411_NLOS_street_canyons.m rename src/{lte => propagation}/test/reference/loss_COST231_large_cities_urban.m (100%) rename src/{lte => propagation}/test/reference/loss_COST231_small_cities_urban.m (100%) rename src/{lte => propagation}/test/reference/loss_ITU1411_LOS.m (100%) rename src/{lte => propagation}/test/reference/loss_ITU1411_NLOS_over_rooftop.m (100%) rename src/{lte => propagation}/test/reference/loss_OH_2_6GHz.m (100%) rename src/{lte => propagation}/test/reference/loss_OH_large_cities_urban.m (100%) rename src/{lte => propagation}/test/reference/loss_OH_openareas.m (100%) rename src/{lte => propagation}/test/reference/loss_OH_small_cities_urban.m (100%) rename src/{lte => propagation}/test/reference/loss_OH_suburban.m (100%) diff --git a/src/buildings/test/reference/buildings_pathloss.m b/src/buildings/test/reference/buildings_pathloss.m index be406cd57..9f0c9a781 100644 --- a/src/buildings/test/reference/buildings_pathloss.m +++ b/src/buildings/test/reference/buildings_pathloss.m @@ -2,7 +2,11 @@ clear all; close all; %% BuildingsPropagationLossModel pathloss test reference script -%% ITU1411, ITU1238, COST231, OH, etc. + + +%% ITU1411, COST231, OH, etc. scripts are in the propagation module +addpath ("../../../propagation/test/reference/"); + %f = 2114e6; % carrier freq Hz, EARFCN = 500 (downlink) %f = 1900e6; % carrier freq Hz, EARFCN = 500 (downlink) diff --git a/src/lte/test/reference/loss_ITU1238.m b/src/buildings/test/reference/loss_ITU1238.m similarity index 100% rename from src/lte/test/reference/loss_ITU1238.m rename to src/buildings/test/reference/loss_ITU1238.m diff --git a/src/lte/test/reference/loss_ITU1411_NLOS_street_canyons.m b/src/lte/test/reference/loss_ITU1411_NLOS_street_canyons.m deleted file mode 100644 index d6f29845a..000000000 --- a/src/lte/test/reference/loss_ITU1411_NLOS_street_canyons.m +++ /dev/null @@ -1,37 +0,0 @@ -function g = loss_ITU1411_NLOS_street_canyons (d, f, w1, w2, x1, x2, alpha) - - %% - %% function g = loss_ITU1411_NLOS_street_canyons(d, c) - %% - %% returns the loss at d meters for f frequency and mobile height m and - %% base station height of hb - - assert(isscalar(f)); - assert(f > 0); - - - lambda = 300000000.0 / f; - - - if (alpha <= 0.33) - f_alpha = -41+110*alpha; - elseif (alpha <=0.42) - f_alpha = -13.94+28*alpha; - elseif (alpha <=0.71) - f_alpha = -5.33+7.51*alpha; - else - f_alpha = 0; - endif - - Lr = -20*log10(x1+x2) + (x1*x2*(f_alpha/(w1*w2))) - 20*log10((4*pi)/lambda); - - Da = -1*(40/(2*pi))*(atan(x2/w2)+atan(x1/w1)-(pi/2)); - - Ld = -10*log10(x2*x1*(x1+x2))+ 2*Da + 0.1*(90-(alpha*(180/pi))) -20*log10((4*pi)/lambda); - - - - g(find(d > 0)) = -10*log10(10^(Lr/10)+10^(Ld/10)); - - g(find(d <= 0)) = 1; - \ No newline at end of file diff --git a/src/lte/test/reference/lte_pathloss.m b/src/lte/test/reference/lte_pathloss.m index f69de68dc..98c232777 100644 --- a/src/lte/test/reference/lte_pathloss.m +++ b/src/lte/test/reference/lte_pathloss.m @@ -2,8 +2,12 @@ clear all; close all; %% LTE pathloss model -%% ITU1411, ITU1238, COST231, OH, etc. +%% ITU1411, COST231, OH, etc. scripts are in the propagation module +addpath ("../../../propagation/test/reference/"); + +%% ITU1238 script is in the buildings module +addpath ("../../../buildings/test/reference/"); d = 104.12; diff --git a/src/lte/test/reference/loss_COST231_large_cities_urban.m b/src/propagation/test/reference/loss_COST231_large_cities_urban.m similarity index 100% rename from src/lte/test/reference/loss_COST231_large_cities_urban.m rename to src/propagation/test/reference/loss_COST231_large_cities_urban.m diff --git a/src/lte/test/reference/loss_COST231_small_cities_urban.m b/src/propagation/test/reference/loss_COST231_small_cities_urban.m similarity index 100% rename from src/lte/test/reference/loss_COST231_small_cities_urban.m rename to src/propagation/test/reference/loss_COST231_small_cities_urban.m diff --git a/src/lte/test/reference/loss_ITU1411_LOS.m b/src/propagation/test/reference/loss_ITU1411_LOS.m similarity index 100% rename from src/lte/test/reference/loss_ITU1411_LOS.m rename to src/propagation/test/reference/loss_ITU1411_LOS.m diff --git a/src/lte/test/reference/loss_ITU1411_NLOS_over_rooftop.m b/src/propagation/test/reference/loss_ITU1411_NLOS_over_rooftop.m similarity index 100% rename from src/lte/test/reference/loss_ITU1411_NLOS_over_rooftop.m rename to src/propagation/test/reference/loss_ITU1411_NLOS_over_rooftop.m diff --git a/src/lte/test/reference/loss_OH_2_6GHz.m b/src/propagation/test/reference/loss_OH_2_6GHz.m similarity index 100% rename from src/lte/test/reference/loss_OH_2_6GHz.m rename to src/propagation/test/reference/loss_OH_2_6GHz.m diff --git a/src/lte/test/reference/loss_OH_large_cities_urban.m b/src/propagation/test/reference/loss_OH_large_cities_urban.m similarity index 100% rename from src/lte/test/reference/loss_OH_large_cities_urban.m rename to src/propagation/test/reference/loss_OH_large_cities_urban.m diff --git a/src/lte/test/reference/loss_OH_openareas.m b/src/propagation/test/reference/loss_OH_openareas.m similarity index 100% rename from src/lte/test/reference/loss_OH_openareas.m rename to src/propagation/test/reference/loss_OH_openareas.m diff --git a/src/lte/test/reference/loss_OH_small_cities_urban.m b/src/propagation/test/reference/loss_OH_small_cities_urban.m similarity index 100% rename from src/lte/test/reference/loss_OH_small_cities_urban.m rename to src/propagation/test/reference/loss_OH_small_cities_urban.m diff --git a/src/lte/test/reference/loss_OH_suburban.m b/src/propagation/test/reference/loss_OH_suburban.m similarity index 100% rename from src/lte/test/reference/loss_OH_suburban.m rename to src/propagation/test/reference/loss_OH_suburban.m