Skip to content

Commit 71bf0db

Browse files
msm-sardarmsm-sardar
committed
Change method
1 parent be273f1 commit 71bf0db

File tree

4 files changed

+72
-85
lines changed

4 files changed

+72
-85
lines changed

‎Base Case/Base_Case.ipynb‎

Lines changed: 69 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,18 @@
359359
"output_type": "stream",
360360
"text": [
361361
"0% [##############################] 100% | ETA: 00:00:00\n",
362-
"Total time elapsed: 00:00:12\n"
362+
"Total time elapsed: 00:00:10\n"
363363
]
364364
},
365365
{
366366
"name": "stdout",
367367
"output_type": "stream",
368368
"text": [
369369
"Title: Writing activities to SQLite3 database:\n",
370-
" Started: 08/25/2021 15:00:14\n",
371-
" Finished: 08/25/2021 15:00:26\n",
372-
" Total time elapsed: 00:00:12\n",
373-
" CPU %: 67.00\n",
370+
" Started: 09/02/2021 10:48:14\n",
371+
" Finished: 09/02/2021 10:48:25\n",
372+
" Total time elapsed: 00:00:10\n",
373+
" CPU %: 66.00\n",
374374
" Memory %: 1.33\n"
375375
]
376376
},
@@ -404,11 +404,11 @@
404404
"output_type": "stream",
405405
"text": [
406406
"Title: Writing activities to SQLite3 database:\n",
407-
" Started: 08/25/2021 15:00:27\n",
408-
" Finished: 08/25/2021 15:00:28\n",
407+
" Started: 09/02/2021 10:48:26\n",
408+
" Finished: 09/02/2021 10:48:26\n",
409409
" Total time elapsed: 00:00:00\n",
410410
" CPU %: 99.70\n",
411-
" Memory %: 1.34\n",
411+
" Memory %: 1.33\n",
412412
"\n",
413413
" ####\n",
414414
" ++++++ Initializing the Composting\n",
@@ -442,11 +442,24 @@
442442
"output_type": "stream",
443443
"text": [
444444
"Title: Writing activities to SQLite3 database:\n",
445-
" Started: 08/25/2021 15:00:28\n",
446-
" Finished: 08/25/2021 15:00:28\n",
445+
" Started: 09/02/2021 10:48:26\n",
446+
" Finished: 09/02/2021 10:48:26\n",
447447
" Total time elapsed: 00:00:00\n",
448448
" CPU %: 100.80\n",
449-
" Memory %: 1.34\n",
449+
" Memory %: 1.33\n"
450+
]
451+
},
452+
{
453+
"name": "stderr",
454+
"output_type": "stream",
455+
"text": [
456+
"Writing activities to SQLite3 database:\n"
457+
]
458+
},
459+
{
460+
"name": "stdout",
461+
"output_type": "stream",
462+
"text": [
450463
"\n",
451464
" ####\n",
452465
" ++++++ Initializing the SS_MRF\n",
@@ -457,7 +470,6 @@
457470
"name": "stderr",
458471
"output_type": "stream",
459472
"text": [
460-
"Writing activities to SQLite3 database:\n",
461473
"0% [##############################] 100% | ETA: 00:00:00\n",
462474
"Total time elapsed: 00:00:00\n"
463475
]
@@ -467,11 +479,11 @@
467479
"output_type": "stream",
468480
"text": [
469481
"Title: Writing activities to SQLite3 database:\n",
470-
" Started: 08/25/2021 15:00:28\n",
471-
" Finished: 08/25/2021 15:00:28\n",
482+
" Started: 09/02/2021 10:48:26\n",
483+
" Finished: 09/02/2021 10:48:26\n",
472484
" Total time elapsed: 00:00:00\n",
473-
" CPU %: 151.20\n",
474-
" Memory %: 1.34\n"
485+
" CPU %: 99.70\n",
486+
" Memory %: 1.33\n"
475487
]
476488
},
477489
{
@@ -504,11 +516,11 @@
504516
"output_type": "stream",
505517
"text": [
506518
"Title: Writing activities to SQLite3 database:\n",
507-
" Started: 08/25/2021 15:00:28\n",
508-
" Finished: 08/25/2021 15:00:28\n",
519+
" Started: 09/02/2021 10:48:26\n",
520+
" Finished: 09/02/2021 10:48:26\n",
509521
" Total time elapsed: 00:00:00\n",
510522
" CPU %: 97.70\n",
511-
" Memory %: 1.34\n"
523+
" Memory %: 1.33\n"
512524
]
513525
},
514526
{
@@ -541,24 +553,11 @@
541553
"output_type": "stream",
542554
"text": [
543555
"Title: Writing activities to SQLite3 database:\n",
544-
" Started: 08/25/2021 15:00:28\n",
545-
" Finished: 08/25/2021 15:00:28\n",
556+
" Started: 09/02/2021 10:48:26\n",
557+
" Finished: 09/02/2021 10:48:27\n",
546558
" Total time elapsed: 00:00:00\n",
547-
" CPU %: 50.40\n",
548-
" Memory %: 1.34\n"
549-
]
550-
},
551-
{
552-
"name": "stderr",
553-
"output_type": "stream",
554-
"text": [
555-
"Writing activities to SQLite3 database:\n"
556-
]
557-
},
558-
{
559-
"name": "stdout",
560-
"output_type": "stream",
561-
"text": [
559+
" CPU %: 100.80\n",
560+
" Memory %: 1.33\n",
562561
"\n",
563562
" ####\n",
564563
" ++++++ Writing the LF\n",
@@ -569,6 +568,7 @@
569568
"name": "stderr",
570569
"output_type": "stream",
571570
"text": [
571+
"Writing activities to SQLite3 database:\n",
572572
"0% [##############################] 100% | ETA: 00:00:00\n",
573573
"Total time elapsed: 00:00:01\n"
574574
]
@@ -578,11 +578,11 @@
578578
"output_type": "stream",
579579
"text": [
580580
"Title: Writing activities to SQLite3 database:\n",
581-
" Started: 08/25/2021 15:00:28\n",
582-
" Finished: 08/25/2021 15:00:30\n",
581+
" Started: 09/02/2021 10:48:27\n",
582+
" Finished: 09/02/2021 10:48:28\n",
583583
" Total time elapsed: 00:00:01\n",
584-
" CPU %: 78.80\n",
585-
" Memory %: 1.35\n"
584+
" CPU %: 78.10\n",
585+
" Memory %: 1.34\n"
586586
]
587587
},
588588
{
@@ -615,10 +615,10 @@
615615
"output_type": "stream",
616616
"text": [
617617
"Title: Writing activities to SQLite3 database:\n",
618-
" Started: 08/25/2021 15:00:30\n",
619-
" Finished: 08/25/2021 15:00:30\n",
618+
" Started: 09/02/2021 10:48:28\n",
619+
" Finished: 09/02/2021 10:48:28\n",
620620
" Total time elapsed: 00:00:00\n",
621-
" CPU %: 133.00\n",
621+
" CPU %: 80.10\n",
622622
" Memory %: 1.35\n",
623623
"\n",
624624
" ####\n",
@@ -653,10 +653,10 @@
653653
"output_type": "stream",
654654
"text": [
655655
"Title: Writing activities to SQLite3 database:\n",
656-
" Started: 08/25/2021 15:00:30\n",
657-
" Finished: 08/25/2021 15:00:30\n",
656+
" Started: 09/02/2021 10:48:28\n",
657+
" Finished: 09/02/2021 10:48:28\n",
658658
" Total time elapsed: 00:00:00\n",
659-
" CPU %: 99.70\n",
659+
" CPU %: 86.00\n",
660660
" Memory %: 1.35\n",
661661
"\n",
662662
" ####\n",
@@ -678,10 +678,10 @@
678678
"output_type": "stream",
679679
"text": [
680680
"Title: Writing activities to SQLite3 database:\n",
681-
" Started: 08/25/2021 15:00:31\n",
682-
" Finished: 08/25/2021 15:00:31\n",
681+
" Started: 09/02/2021 10:48:29\n",
682+
" Finished: 09/02/2021 10:48:29\n",
683683
" Total time elapsed: 00:00:00\n",
684-
" CPU %: 111.20\n",
684+
" CPU %: 86.30\n",
685685
" Memory %: 1.36\n"
686686
]
687687
},
@@ -707,37 +707,24 @@
707707
"output_type": "stream",
708708
"text": [
709709
"0% [##############################] 100% | ETA: 00:00:00\n",
710-
"Total time elapsed: 00:00:00\n"
710+
"Total time elapsed: 00:00:00\n",
711+
"Writing activities to SQLite3 database:\n"
711712
]
712713
},
713714
{
714715
"name": "stdout",
715716
"output_type": "stream",
716717
"text": [
717718
"Title: Writing activities to SQLite3 database:\n",
718-
" Started: 08/25/2021 15:00:32\n",
719-
" Finished: 08/25/2021 15:00:32\n",
719+
" Started: 09/02/2021 10:48:30\n",
720+
" Finished: 09/02/2021 10:48:30\n",
720721
" Total time elapsed: 00:00:00\n",
721-
" CPU %: 92.40\n",
722-
" Memory %: 1.37\n",
722+
" CPU %: 86.80\n",
723+
" Memory %: 1.38\n",
723724
"\n",
724725
" ####\n",
725726
" ++++++ Writing the Reprocessing\n",
726-
" "
727-
]
728-
},
729-
{
730-
"name": "stderr",
731-
"output_type": "stream",
732-
"text": [
733-
"Writing activities to SQLite3 database:\n"
734-
]
735-
},
736-
{
737-
"name": "stdout",
738-
"output_type": "stream",
739-
"text": [
740-
"\n"
727+
" \n"
741728
]
742729
},
743730
{
@@ -753,11 +740,11 @@
753740
"output_type": "stream",
754741
"text": [
755742
"Title: Writing activities to SQLite3 database:\n",
756-
" Started: 08/25/2021 15:00:33\n",
757-
" Finished: 08/25/2021 15:00:33\n",
743+
" Started: 09/02/2021 10:48:31\n",
744+
" Finished: 09/02/2021 10:48:31\n",
758745
" Total time elapsed: 00:00:00\n",
759-
" CPU %: 100.20\n",
760-
" Memory %: 1.37\n",
746+
" CPU %: 114.70\n",
747+
" Memory %: 1.38\n",
761748
"\n",
762749
" ####\n",
763750
" ++++++ Writing the Collection_product\n",
@@ -778,10 +765,10 @@
778765
"output_type": "stream",
779766
"text": [
780767
"Title: Writing activities to SQLite3 database:\n",
781-
" Started: 08/25/2021 15:00:33\n",
782-
" Finished: 08/25/2021 15:00:34\n",
768+
" Started: 09/02/2021 10:48:31\n",
769+
" Finished: 09/02/2021 10:48:32\n",
783770
" Total time elapsed: 00:00:00\n",
784-
" CPU %: 99.90\n",
771+
" CPU %: 87.50\n",
785772
" Memory %: 1.38\n"
786773
]
787774
},
@@ -815,11 +802,11 @@
815802
"output_type": "stream",
816803
"text": [
817804
"Title: Writing activities to SQLite3 database:\n",
818-
" Started: 08/25/2021 15:00:35\n",
819-
" Finished: 08/25/2021 15:00:35\n",
805+
" Started: 09/02/2021 10:48:32\n",
806+
" Finished: 09/02/2021 10:48:33\n",
820807
" Total time elapsed: 00:00:00\n",
821-
" CPU %: 90.10\n",
822-
" Memory %: 1.38\n",
808+
" CPU %: 83.10\n",
809+
" Memory %: 1.39\n",
823810
"\n",
824811
" Grouping the exchanges with parameters in Database LF\n",
825812
" \n",
@@ -835,7 +822,7 @@
835822
"\n",
836823
" Grouping the exchanges with parameters in Database Collection\n",
837824
" \n",
838-
"Time for writing the project: 47 second\n"
825+
"Time for writing the project: 39 second\n"
839826
]
840827
}
841828
],
@@ -886,7 +873,7 @@
886873
"\n",
887874
"for key in common_data.Index:\n",
888875
" input_dict['Collection'][key]=1\n",
889-
"demo.process_start_scenario(input_dict,'Collection')"
876+
"demo.create_scenario(input_dict,'Collection')"
890877
]
891878
},
892879
{

‎Monte Carlo Simulation/MonteCarlo.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,7 @@
12091209
"\n",
12101210
"for key in common_data.Index:\n",
12111211
" input_dict['Collection'][key]=1\n",
1212-
"demo.process_start_scenario(input_dict,'Collection')"
1212+
"demo.create_scenario(input_dict,'Collection')"
12131213
]
12141214
},
12151215
{

‎Optimization/Optimization (Base Case).ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@
728728
"\n",
729729
"for key in common_data.Index:\n",
730730
" input_dict['Collection'][key]=1\n",
731-
"demo.process_start_scenario(input_dict,'Collection')"
731+
"demo.create_scenario(input_dict,'Collection')"
732732
]
733733
},
734734
{

‎Optimization/Optimization (Scenarios 1-3).ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@
10891089
"\n",
10901090
"for key in common_data.Index:\n",
10911091
" input_dict['Collection'][key]=1\n",
1092-
"demo.process_start_scenario(input_dict,'Collection')"
1092+
"demo.create_scenario(input_dict,'Collection')"
10931093
]
10941094
},
10951095
{

0 commit comments

Comments
 (0)