diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e8f159326..fe82acc85 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -22,4 +22,4 @@ } } ] -} \ No newline at end of file +} diff --git a/doc/ns3_html_theme/ns3_doxy_header.html b/doc/ns3_html_theme/ns3_doxy_header.html index 0ba09cf07..cce6448b0 100644 --- a/doc/ns3_html_theme/ns3_doxy_header.html +++ b/doc/ns3_html_theme/ns3_doxy_header.html @@ -28,7 +28,7 @@ $extrastylesheet - +
@@ -39,9 +39,9 @@ $extrastylesheet - ns-3 Logo + href="https://www.nsnam.org/"> + ns-3 Logo @@ -54,19 +54,19 @@ $extrastylesheet
diff --git a/doc/ns3_html_theme/static/drop-down-menu.js b/doc/ns3_html_theme/static/drop-down-menu.js index a0ca0a6e5..09dcdeaf4 100644 --- a/doc/ns3_html_theme/static/drop-down-menu.js +++ b/doc/ns3_html_theme/static/drop-down-menu.js @@ -30,9 +30,9 @@ // POSSIBILITY OF SUCH DAMAGE. // -var timeout = 250; -var closetimer = 0; -var ddmenuitem = 0; +var timeout = 250; +var closetimer = 0; +var ddmenuitem = 0; // open hidden layer function mopen(id) diff --git a/doc/ns3_html_theme/static/ns3_stylesheet.css b/doc/ns3_html_theme/static/ns3_stylesheet.css index 2f4f69b99..4131072e8 100644 --- a/doc/ns3_html_theme/static/ns3_stylesheet.css +++ b/doc/ns3_html_theme/static/ns3_stylesheet.css @@ -96,7 +96,7 @@ div.sphinxsidebar a { #projectrow { - height: 56px; + height: 56px; } #projectlogo { diff --git a/doc/ns3_html_theme/static/sidebar.js b/doc/ns3_html_theme/static/sidebar.js index a45e1926a..8994f9118 100644 --- a/doc/ns3_html_theme/static/sidebar.js +++ b/doc/ns3_html_theme/static/sidebar.js @@ -98,9 +98,9 @@ $(function() { // find the height of the viewport to center the '<<' in the page var viewport_height; if (window.innerHeight) - viewport_height = window.innerHeight; + viewport_height = window.innerHeight; else - viewport_height = $(window).height(); + viewport_height = $(window).height(); sidebarbutton.find('span').css({ 'display': 'block', 'margin-top': (viewport_height - sidebar.position().top - 20) / 2 diff --git a/doc/ns3_html_theme/theme.conf b/doc/ns3_html_theme/theme.conf index 16dd1b00e..f112f8e84 100644 --- a/doc/ns3_html_theme/theme.conf +++ b/doc/ns3_html_theme/theme.conf @@ -22,29 +22,28 @@ collapsiblesidebar = false externalrefs = false bgcolor = white -textcolor = black +textcolor = black linkcolor = #91A501 visitedlinkcolor = #91A501 headbgcolor = #E3E3E3 -headtextcolor = #373737 -headlinkcolor = #91A501 +headtextcolor = #373737 +headlinkcolor = #91A501 -relbarbgcolor = #D5D5D5 +relbarbgcolor = #D5D5D5 relbarlinkcolor = #373737 relbartextcolor = #373737 -sidebarbgcolor = #FAFAFA +sidebarbgcolor = #FAFAFA sidebartextcolor = #373737 sidebarlinkcolor = #91A501 sidebarbtncolor = #D5D5D5 footerbgcolor = #D5D5D5 -footertextcolor = #364D7C +footertextcolor = #364D7C codebgcolor = #FBFCFD codetextcolor = black bodyfont = 'Lucida Grande', Verdana, Geneva, Arial, sans-serif headfont = 'Lucida Grande', Verdana, Geneva, Arial, sans-serif - diff --git a/src/lte/test/reference/generate_test_data_lte_spectrum_value_noise.m b/src/lte/test/reference/generate_test_data_lte_spectrum_value_noise.m index 29993ef7f..78e387202 100644 --- a/src/lte/test/reference/generate_test_data_lte_spectrum_value_noise.m +++ b/src/lte/test/reference/generate_test_data_lte_spectrum_value_noise.m @@ -16,7 +16,7 @@ for nrbs = [6 15] npsdv = ones (1,nrbs) * (noise_psd * 10.^(noise_figure_dB/10)); printf("SpectrumValue %s (LteSpectrumValueHelper::GetSpectrumModel (%d, %d));\n", - name, earfcn, nrbs); + name, earfcn, nrbs); print_C_vector (npsdv, name); printf("AddTestCase (new LteNoisePsdTestCase (\"%s\", %d, %d, %f, %s));\n\n", name, earfcn, nrbs, noise_figure_dB, name); diff --git a/src/lte/test/reference/generate_test_data_lte_spectrum_value_txpsd.m b/src/lte/test/reference/generate_test_data_lte_spectrum_value_txpsd.m index 8a2af5e2a..63868fd38 100644 --- a/src/lte/test/reference/generate_test_data_lte_spectrum_value_txpsd.m +++ b/src/lte/test/reference/generate_test_data_lte_spectrum_value_txpsd.m @@ -28,11 +28,11 @@ for run = 1:2 print_C_vector (activeRbs, arname); printf("SpectrumValue %s (LteSpectrumValueHelper::GetSpectrumModel (%d, %d));\n", - svname, earfcn, nrbs); + svname, earfcn, nrbs); print_C_vector (txpsd, svname); printf("AddTestCase (new LteTxPsdTestCase (\"%s\", %d, %d, %f, %s, %s));\n\n", - basename, earfcn, nrbs, txpowdBm, arname, svname); + basename, earfcn, nrbs, txpowdBm, arname, svname); endfor diff --git a/src/lte/test/reference/lte_cqi_generation.m b/src/lte/test/reference/lte_cqi_generation.m index 751719c57..da0c47e73 100644 --- a/src/lte/test/reference/lte_cqi_generation.m +++ b/src/lte/test/reference/lte_cqi_generation.m @@ -9,11 +9,11 @@ ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbsControl = 25; % tx bandwidth configuration in number of RBs bwControl = nrbsControl * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 nrbsData = 12; % tx bandwidth configuration in number of RBs bwData = nrbsData * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBmData = kT + 10*log10(bwData); % noise power dBm diff --git a/src/lte/test/reference/lte_link_budget.m b/src/lte/test/reference/lte_link_budget.m index 6be3bcc1f..1bf2da150 100644 --- a/src/lte/test/reference/lte_link_budget.m +++ b/src/lte/test/reference/lte_link_budget.m @@ -7,7 +7,7 @@ close all; f = 2160e6; % carrier freq Hz, EARFCN = 500 (downlink) nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz n = kT + 10*log10(bw); % noise power dBm p = 30; % tx power dBm diff --git a/src/lte/test/reference/lte_link_budget_interference.m b/src/lte/test/reference/lte_link_budget_interference.m index 20c871e0b..f62af60a9 100644 --- a/src/lte/test/reference/lte_link_budget_interference.m +++ b/src/lte/test/reference/lte_link_budget_interference.m @@ -8,7 +8,7 @@ fdl = 2120e6; % DL carrier freq Hz, EARFCN = 100 ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBm = kT + 10*log10(bw); % noise power dBm @@ -73,7 +73,7 @@ for d2 = [20 50 200 500] printf("AddTestCase (new LteInterferenceTestCase (\"d1=%d, d2=%d\", % f, %f, % f, %f, % f, %f, , ));\n", \ - d1, d2, d1, d2, dlsinr, ulsinr, dlse, ulse) + d1, d2, d1, d2, dlsinr, ulsinr, dlse, ulse) endfor diff --git a/src/lte/test/reference/lte_link_budget_interference_fr.m b/src/lte/test/reference/lte_link_budget_interference_fr.m index 358b3143e..dd3bf5643 100644 --- a/src/lte/test/reference/lte_link_budget_interference_fr.m +++ b/src/lte/test/reference/lte_link_budget_interference_fr.m @@ -8,7 +8,7 @@ fdl = 2120e6; % DL carrier freq Hz, EARFCN = 100 ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBm = kT + 10*log10(bw); % noise power dBm diff --git a/src/lte/test/reference/lte_link_budget_x2_handover_measures.m b/src/lte/test/reference/lte_link_budget_x2_handover_measures.m index 9bd28badf..1c95df1dd 100644 --- a/src/lte/test/reference/lte_link_budget_x2_handover_measures.m +++ b/src/lte/test/reference/lte_link_budget_x2_handover_measures.m @@ -7,7 +7,7 @@ close all; f = 2160e6; % carrier freq Hz, EARFCN = 500 (downlink) nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz n = kT + 10*log10(bw); % noise power dBm p = 20; % tx power dBm @@ -20,9 +20,9 @@ nW = 10.^((n+nf-30)./10); % noise power in W %%d = logspace (0,5,100); x = linspace (0,4000,100); g1 = gain_freespace(abs (x-1000),f); % propagation gain from - % eNB 1 + % eNB 1 g2 = gain_freespace(abs (x-2000),f); % propagation gain from - % eNB 2 + % eNB 2 sinr1 = 10.*log10 (pW .* g1 ./ (nW + pW .* g2)); %dB sinr2 = 10.*log10 (pW .* g2 ./ (nW + pW .* g1)); %dB diff --git a/src/lte/test/reference/lte_uplink_power_control.m b/src/lte/test/reference/lte_uplink_power_control.m index f52646b4c..04ef9256b 100644 --- a/src/lte/test/reference/lte_uplink_power_control.m +++ b/src/lte/test/reference/lte_uplink_power_control.m @@ -46,19 +46,19 @@ fc = -4; stepNumToExecute = 12; fcValueSequence = [ - [0, 0]; - [-1, 20]; - [-1, 20]; - [1, 1]; - [3, 10]; - [1, 15]; - [3, 1]; - [1, 10]; - [1, 10]; - [-1, 1]; - [-1, 20]; - [1, 5] - ]; + [0, 0]; + [-1, 20]; + [-1, 20]; + [1, 1]; + [3, 10]; + [1, 15]; + [3, 1]; + [1, 10]; + [1, 10]; + [-1, 1]; + [-1, 20]; + [1, 5] +]; %% distances %% d1