wbp

neams/cyclus/cyclus.wbp

@@ -12,7 +12,7 @@ filter_pattern = "CYCLUS"
 processor("Material flow prototype to prototype") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN trade_flow_prototype/,/END trade_flow_prototype/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN trade_flow_prototype/,/END trade_flow_prototype/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label
@@ -39,7 +39,7 @@ processor("Material flow prototype to prototype") {
 processor("Material flow agent to agent") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN trade_flow_agent/,/END trade_flow_agent/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN trade_flow_agent/,/END trade_flow_agent/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label
@@ -69,7 +69,7 @@ processor("Material flow agent to agent") {
 processor("Material flow commodity") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN commodity_flow/,/END commodity_flow/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN commodity_flow/,/END commodity_flow/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label
@@ -97,7 +97,7 @@ processor("Material flow commodity") {
 processor("Agents entered") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_entered/,/END agent_flow_entered/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_entered/,/END agent_flow_entered/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label
@@ -125,7 +125,7 @@ processor("Agents entered") {
 processor("Agents exited") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_exited/,/END agent_flow_exited/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_exited/,/END agent_flow_exited/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label
@@ -155,7 +155,7 @@ processor("Agents exited") {
 processor("Agents active") {
     delimiter = ","
 
-    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_deployed/,/END agent_flow_deployed/ { if(index($1,begin)==1 || index($NF,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
+    logic = """${AWK} -v new=${NEW_SHEET} -v begin="BEGIN" -v end="END" "/BEGIN agent_flow_deployed/,/END agent_flow_deployed/ { if(index($1,begin)==1 || index($1,end)==1) {start=NR;next;} if(NR==start+1) {steps=$0; next;} if(NR==start+2){next;} print steps; print $0; print new }" ${CURRENT_FILE}"""
 
     graph("${a2}"){
         % key axis (x-axis) label

neams/cyclus/cyclus_processor.py

@@ -12,11 +12,6 @@
 from processor import load_environment, BinnedData, Sheet, Options, Processor
 
 
-from cyclus_gui.gui.backend_window import BackendWindow
-from tkinter import *
-
-
-
 class CyclusPostrunner:
     def __init__(self, sqlite_path):
         #!
@@ -154,6 +149,10 @@ def generate_trade_flow(self, groupby):
                     raise ValueError('The x values are not the same!')
             else:
                 self.csv_string += ','.join([str(q) for q in x]) + '\n'
+                if groupby == 'prototype':
+                	self.csv_string += 'sender -> [commodity] -> receiver, trade_mass\n'
+                else:
+                	self.csv_string += 'sender (senderid) -> [commodity] -> receiver (receiverid), trade_mass\n'
 
             if groupby == 'prototype':
                 self.csv_string  += '%s -> [%s] -> %s' %(s,c,r) + ',' + ','.join([str(q) for q in y]) + '\n'
@@ -181,6 +180,7 @@ def generate_commodity_flow(self):
                     raise ValueError('The x values are not the same')
             else:
                 self.csv_string += ','.join([str(q) for q in x]) + '\n'
+                self.csv_string += 'commodity, trade_mass\n'
 
             self.csv_string += commod + ',' + ','.join([str(q) for q in y])+'\n'
             prev_x = x
@@ -200,6 +200,7 @@ def generate_agent_flow(self):
                         raise ValueError('The x values are not the same')
                 else:
                     self.csv_string += ','.join([str(q) for q in x]) + '\n'
+                    self.csv_string += 'prototype, %s\n' %which
 
                 self.csv_string += proto + ',' + ','.join([str(q) for q in y]) + '\n'
                 prev_x = x
@@ -316,57 +317,3 @@ def get_timeseries_flow(self, timeseries):
 
     def get_inventory_flow(self):
         z=0
-
-
-def read_csv(file, data_type):
-    filestr = file.read()
-    # lol research
-    alpha = filestr.find('BEGIN %s'%data_type) + len('BEGIN %s'%data_type)
-    omega = filestr.find('END %s' %data_type)
-    result = filestr[alpha+1:omega-1]
-    lines = result.split('\n')
-    lines = [q.split(',') for q in lines]
-    x = [float(q) for q in lines[0]]
-
-    # where's y?
-    y_indx = lines[1].index('y')
-    print(y_indx)
-
-    labels = ['_'.join(q[:y_indx]) for q in lines[2:]]
-    ys = [np.array(q[y_indx:], dtype=float) for q in lines[2:]]
-
-    for indx, val in enumerate(ys):
-        plt.plot(x, ys[indx], label=labels[indx])
-
-    plt.title(data_type.replace('_', ' ').capitalize())
-    plt.legend()
-    plt.show()
-
-
-
-def main():
-    CyclusPostrunner('out.sqlite')
-    return
-    parser = ArgumentParser(description='', epilog='Jin Whan Bae')
-    #parser.add_argument('file', type=FileType('r'),
-    #                    help='Cyclus output csv file path')
-    parser.add_argument('file', type=str)
-    parser.add_argument('-data_type', type=str, default=None,
-                        dest='data_type',
-                        help='Type of data to be printed [trade_flow_agent/trade_flow_prototype/commodity_flow/agent_flow_entered/agent_flow_exited/agent_flow_deployed]'
-                        )
-    args = parser.parse_args()
-    if '.csv' in args.file:
-        sqlite = args.file.replace('.csv', '.sqlite')
-        args.file = os.path.dirname(args.file)
-    root = Tk()
-    app = BackendWindow(root, args.file, sqlite)
-    root.mainloop()
-
-
-    #read_csv(args.file, args.data_type)
-    # cyclus_processor = CyclusProcessor('cyclus', args)   
-
-
-if __name__ == '__main__':
-    main()

neams/cyclus_simple.py

@@ -1,7 +1,4 @@
 #!/usr/bin/python
-"""Scale runtime environment"""
-
-# standard imports
 import os
 import sys
 import json
@@ -22,6 +19,7 @@ def __init__(self):
         super(CyclusRuntimeEnvironment, self).__init__()
         self.executable = 'cyclus'
 
+
     def app_name(self):
         """returns the app's self-designated name"""
         return "cyclus"
@@ -51,8 +49,6 @@ def run_args(self, options):
             self.echo(1, '#!!!!! It simply adds a new SimId.')
             self.echo(1, '#!!!!! So you will have one file with multiple simulation results.')
         args.append(self.outpath)
-        #args.append('-v')
-        #args.append(self.verbosity)
         return args