uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

separate missing quos metrics from never calculated

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-04-24 17:46:19 +03:00
parent a043548dab
commit a20cd5d497
2 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
engine/calldesc.go
View File

@@ -749,8 +749,18 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
lcrCD.Category = category
lcrCD.Account = supplier
lcrCD.Subject = supplier
var asrMean, acdMean, tcdMean, accMean, tccMean float64
var qosSortParams []string
var asrValues sort.Float64Slice
var acdValues sort.Float64Slice
var tcdValues sort.Float64Slice
var accValues sort.Float64Slice
var tccValues sort.Float64Slice
// track if one value is never calculated
asrNeverConsidered := true
acdNeverConsidered := true
tcdNeverConsidered := true
accNeverConsidered := true
tccNeverConsidered := true
if lcrCost.Entry.Strategy == LCR_STRATEGY_QOS || lcrCost.Entry.Strategy == LCR_STRATEGY_QOS_THRESHOLD {
rpfKey := utils.ConcatenatedKey(ratingProfileSearchKey, supplier)
if rpf, err := dataStorage.GetRatingProfile(rpfKey, false); err == nil || rpf != nil {
@@ -764,30 +774,41 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
}
}
}
var asrValues sort.Float64Slice
var acdValues sort.Float64Slice
var tcdValues sort.Float64Slice
var accValues sort.Float64Slice
var tccValues sort.Float64Slice
for _, qId := range cdrStatsQueueIds {
statValues := make(map[string]float64)
if err := stats.GetValues(qId, &statValues); err != nil {
Logger.Warning(fmt.Sprintf("Error getting stats values for queue id %s: %v", qId, err))
}
if asr, exists := statValues[ASR]; exists && asr > STATS_NA {
asrValues = append(asrValues, asr)
if asr, exists := statValues[ASR]; exists {
if asr > STATS_NA {
asrValues = append(asrValues, asr)
}
asrNeverConsidered = false
}
if acd, exists := statValues[ACD]; exists && acd > STATS_NA {
acdValues = append(acdValues, acd)
if acd, exists := statValues[ACD]; exists {
if acd > STATS_NA {
acdValues = append(acdValues, acd)
}
acdNeverConsidered = false
}
if tcd, exists := statValues[TCD]; exists && tcd > STATS_NA {
tcdValues = append(tcdValues, tcd)
if tcd, exists := statValues[TCD]; exists {
if tcd > STATS_NA {
tcdValues = append(tcdValues, tcd)
}
tcdNeverConsidered = false
}
if acc, exists := statValues[ACC]; exists && acc > STATS_NA {
accValues = append(accValues, acc)
if acc, exists := statValues[ACC]; exists {
if acc > STATS_NA {
accValues = append(accValues, acc)
}
accNeverConsidered = false
}
if tcc, exists := statValues[TCC]; exists && tcc > STATS_NA {
tccValues = append(tccValues, tcc)
if tcc, exists := statValues[TCC]; exists {
if tcc > STATS_NA {
tccValues = append(tccValues, tcc)
}
tccNeverConsidered = false
}
}
asrValues.Sort()
@@ -796,11 +817,6 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
accValues.Sort()
tccValues.Sort()
asrMean = utils.AvgNegative(asrValues)
acdMean = utils.AvgNegative(acdValues)
tcdMean = utils.AvgNegative(tcdValues)
accMean = utils.AvgNegative(accValues)
tccMean = utils.AvgNegative(tccValues)
//log.Print(asrValues, acdValues)
if lcrCost.Entry.Strategy == LCR_STRATEGY_QOS_THRESHOLD || lcrCost.Entry.Strategy == LCR_STRATEGY_QOS {
qosSortParams = lcrCost.Entry.GetParams()
@@ -866,8 +882,24 @@ func (cd *CallDescriptor) GetLCR(stats StatsInterface) (*LCRCost, error) {
Cost: cc.Cost,
Duration: cc.GetDuration(),
}
qos := make(map[string]float64, 5)
if !asrNeverConsidered {
qos[ASR] = utils.AvgNegative(asrValues)
}
if !acdNeverConsidered {
qos[ACD] = utils.AvgNegative(acdValues)
}
if !tcdNeverConsidered {
qos[TCD] = utils.AvgNegative(tcdValues)
}
if !accNeverConsidered {
qos[ACC] = utils.AvgNegative(accValues)
}
if !tccNeverConsidered {
qos[TCC] = utils.AvgNegative(tccValues)
}
if utils.IsSliceMember([]string{LCR_STRATEGY_QOS, LCR_STRATEGY_QOS_THRESHOLD}, lcrCost.Entry.Strategy) {
supplCost.QOS = map[string]float64{ASR: asrMean, ACD: acdMean, TCD: tcdMean, ACC: accMean, TCC: tccMean}
supplCost.QOS = qos
supplCost.qosSortParams = qosSortParams
}
lcrCost.SupplierCosts = append(lcrCost.SupplierCosts, supplCost)

12
engine/lcr.go
View File

@@ -250,12 +250,22 @@ func (qoss QOSSorter) Swap(i, j int) {
func (qoss QOSSorter) Less(i, j int) bool {
for _, param := range qoss[i].qosSortParams {
if qoss[j].QOS[param] == -1 { // -1 is the best
// if one of the supplier is missing the qos parram skip to next one
if _, exists := qoss[i].QOS[param]; !exists {
continue
}
if _, exists := qoss[j].QOS[param]; !exists {
continue
}
// -1 is the best
if qoss[j].QOS[param] == -1 {
return false
}
// more is better
if qoss[i].QOS[param] == -1 || qoss[i].QOS[param] > qoss[j].QOS[param] {
return true
}
// skip to next param
if qoss[i].QOS[param] == qoss[j].QOS[param] {
continue
}