Commit 36cbde05 authored by caminha's avatar caminha
Browse files

minor stuff

parent a69a3beb
......@@ -138,13 +138,13 @@ mask = (fullCsDF.Type.str.contains("CacheSizeByte")) & \
maskedData = fullCsDF.loc[mask, ['Node', 'SecondSubInterval', 'Packets', 'appScenario', 'seed']]
maskedData.rename(columns={'SecondSubInterval': 'Second Dataset', 'appScenario': 'Application Scenario'}, inplace=True)
single_catplot(title="Volume of Data in Content Store v1", ylabel='Content Store Size (KB)', xlabel='Node or Type of Node',
single_catplot(title="Volume of Data in Content Store", ylabel='Content Store Size (KB)', xlabel='Node or Type of Node',
single_pdf=pdf, kind=params.catType, x='Node', order=nodeOrder, y='Packets', hue='Application Scenario',
hue_order=scenarioOrder, data=maskedData)#, row='Second Dataset', row_order=subIntervalOrder)
single_relplot(title="Volume of Data in Content Store v1", ylabel='Content Store Size (KB)', xlabel='Node or Type of Node',
single_pdf=pdf, kind='line', x='Node', y='Packets', hue='Application Scenario', style='Application Scenario',
hue_order=scenarioOrder, data=maskedData)#, row='Second Dataset', row_order=subIntervalOrder)
# single_relplot(title="Volume of Data in Content Store v1", ylabel='Content Store Size (KB)', xlabel='Node or Type of Node',
# single_pdf=pdf, kind='line', x='Node', y='Packets', hue='Application Scenario', style='Application Scenario',
# hue_order=scenarioOrder, data=maskedData)#, row='Second Dataset', row_order=subIntervalOrder)
# duo_catplot(title="Volume of Data in Content Store v2", ylabel='Content Store Size (KB)', xlabel='Node or Type of Node',
# single_pdf=pdf, kind=params.catType, x='Node', order=nodeOrder, y='Packets', row='appScenario',
......@@ -179,13 +179,13 @@ aggData.loc[aggData.NodeType == "Producer", "Node"] = "Producer"
aggData.loc[aggData.Node.isin(["DR2", "DR3"]), "Node"] = "DR2/DR3"
aggData.rename(columns={'SecondSubInterval': 'Second Dataset', 'appScenario': 'Application Scenario'}, inplace=True)
single_catplot(title="Data Transmissions v1", ylabel='Transmitted data (KB)', xlabel='Node or Type of Node',
single_catplot(title="Data Transmissions", ylabel='Transmitted data (KB)', xlabel='Node or Type of Node',
single_pdf=pdf, kind=params.catType, x='Node', order=nodeOrder[2:], y='KilobytesRaw', data=aggData,
hue='Application Scenario', hue_order=scenarioOrder)#, row='Second Dataset', row_order=subIntervalOrder)
single_relplot(title="Data Transmissions v1", ylabel='Transmitted data (KB)', xlabel='Node or Type of Node',
single_pdf=pdf, kind='line', x='Node', y='KilobytesRaw', hue='Application Scenario', data=aggData,
style='Application Scenario', hue_order=scenarioOrder)#, row='Second Dataset', row_order=subIntervalOrder)
# single_relplot(title="Data Transmissions v1", ylabel='Transmitted data (KB)', xlabel='Node or Type of Node',
# single_pdf=pdf, kind='line', x='Node', y='KilobytesRaw', hue='Application Scenario', data=aggData,
# style='Application Scenario', hue_order=scenarioOrder)#, row='Second Dataset', row_order=subIntervalOrder)
# duo_catplot(title="Data Transmissions v2", ylabel='Transmitted data (KB)', xlabel='Node or Type of Node',
# single_pdf=pdf, kind=params.catType, x='Node', order=nodeOrder[2:], y='KilobytesRaw', row='appScenario',
......@@ -223,16 +223,16 @@ single_catplot(title="Normalized First Data Delay", ylabel='Normalized Delay', y
data=maskedData)
logger.info("Plotting stream hits...")
mask = (fullStreamHitsDF.NodeType.str.contains("Domain Router")) & (fullStreamHitsDF.Node == "DR1") & (
fullStreamHitsDF.HitType == "InStream")
maskedData = fullStreamHitsDF.loc[mask, ['Node', 'SecondSubInterval', 'HitCount', 'HitType', 'seed']]
maskedData.rename(columns={'SecondSubInterval': 'Second Dataset', 'appScenario': 'Application Scenario'}, inplace=True)
single_catplot(title="First Domain Router Stream Hits", ylabel='Number of streams reused', single_pdf=pdf, y='HitCount',
xlabel='Dataset requested by C2 compared to dataset requested by C1', kind=params.catType,
x='Second Dataset', data=maskedData)
# logger.info("Plotting stream hits...")
#
# mask = (fullStreamHitsDF.NodeType.str.contains("Domain Router")) & (fullStreamHitsDF.Node == "DR1") & (
# fullStreamHitsDF.HitType == "InStream")
# maskedData = fullStreamHitsDF.loc[mask, ['Node', 'SecondSubInterval', 'HitCount', 'HitType', 'seed']]
# maskedData.rename(columns={'SecondSubInterval': 'Second Dataset', 'appScenario': 'Application Scenario'}, inplace=True)
#
# single_catplot(title="First Domain Router Stream Hits", ylabel='Number of streams reused', single_pdf=pdf, y='HitCount',
# xlabel='Dataset requested by C2 compared to dataset requested by C1', kind=params.catType,
# x='Second Dataset', data=maskedData)
# logger.info("Plotting stream delays...")
#
......
......@@ -548,7 +548,7 @@ namespace ns3
applyTransformations (contentList, missingChain, consumerSubscription->params.getTransformationsParams ());
}
NS_LOG_INFO("Have " << contentList.size() << " samples after transformations");
Block contentBlk = response->getContent ();
for (auto content : contentList)
contentBlk.push_back (content.wireEncode ());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment