Commit 6e253b70 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF625_MEC030' of https://forge.etsi.org/rep/mec/AdvantEDGE into STF625_MEC030

parents 736b4873 05154071

go-apps/meep-gis-engine/server/gis-engine_test.go

+2 −2
Original line number Diff line number Diff line
@@ -4148,7 +4148,7 @@ func terminateScenario() { 
	}

}



func updateScenario(testUpdate string) {

/*func updateScenario(testUpdate string) {



	switch testUpdate {

	case "mobility1":
@@ -4199,7 +4199,7 @@ func updateScenario(testUpdate string) { 
	default:

	}

	time.Sleep(100 * time.Millisecond)

}

}*/



func initializeVars() {

	mod.DbAddress = redisTestAddr

go-packages/meep-vis-traffic-mgr/traffic-mgr.go

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package vistrafficmgr 
import (

	"database/sql"

	"errors"

	"math"

	"strconv"

	"strings"

	"time"
@@ -1139,8 +1140,8 @@ func findReducedSignalStrength(inRsrp int32, inRsrq int32, users int32, averageL 


	// Case: crowded area

	if users > averageLoad {

		redRsrp = int32(float32(inRsrp) * (float32(averageLoad) / float32(users)))

		redRsrq = int32(float32(inRsrq) * (float32(averageLoad) / float32(users)))

		redRsrp = int32(math.Max(float64(float32(inRsrp)*(float32(averageLoad)/float32(users))), float64(40)))

		redRsrq = int32(math.Max(float64(float32(inRsrq)*(float32(averageLoad)/float32(users))), float64(0)))



		return redRsrp, redRsrq, nil