CPM model #49

mandd · 2023-03-24T21:07:36Z

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

Closes #50

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

1. Review all computer code.
2. If any changes occur to the input syntax, there must be an accompanying change to the user manual.
3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
4. Regression tests have to complete successfully.
5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test.
6. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.

mandd · 2023-03-24T21:21:05Z

@wangcj05: this is the initial development of the model designed to perform critical path calculations for the plant outage optimization project. Do you mind start to take a look at it?
One thing I am not too happy is the fact that for external models (when we need to initialize the class from a given file) we need to pass the initialization input file in the step block rather than doing it directly in the ExternalModel block.

The model is initialized by providing a set of activities and the graph connecting the activities. This is specified in a python class as of now. When a more generic format will be available this class will be expanded

mandd · 2023-03-24T22:28:35Z

Once the main code is good on your end I will add documentation, fill comments, class documentation, etc

wangcj05

@mandd: I have some comments for you to consider.

wangcj05 · 2023-03-27T15:42:26Z

src/CPM/BaseCPMmodel.py

+    file2open = inputs[0].getFilename()
+    spec = importlib.util.spec_from_file_location("project", str(file2open))
+    importedModule = importlib.util.module_from_spec(spec)
+    sys.modules["project"] = importedModule
+    spec.loader.exec_module(importedModule)


I think you may need to add some checks and enhancement for these lines. Here assumes the first file in the 'inputs' is the module file that you want to load, and assumes the module name is "project". If the module name is always "project", I suggest to use self variable to store it, otherwise provide an option for the users to choose which module to load.

good point, test has been added

wangcj05 · 2023-03-27T15:43:29Z

src/CPM/BaseCPMmodel.py

+    self.graph = importedModule.project.graph
+    return Kwargs
+
+  @abc.abstractmethod


wangcj05 · 2023-03-27T15:43:41Z

src/CPM/BaseCPMmodel.py

+
+    self.pert = Pert(self.graph)
+
+    end_time = self.pert.info_dict[self.pert.end_activity]['ef']


wangcj05 · 2023-03-27T15:47:01Z

src/CPM/BaseCPMmodel.py

+    inputDict = inputDict['SampledVars']
+    for input in inputDict.keys():
+      for act in self.graph.keys():
+        if act.returnName()==container.mapping[input]:
+          act.updateDuration(inputDict[input])
+
+    self.pert = Pert(self.graph)


It seems these can be moved to "createNewInput"

correct, moved

wangcj05 · 2023-03-27T15:57:06Z

src/CPM/PertMain2.py

@@ -0,0 +1,261 @@
+# Developed from: https://github.com/nofaralfasi/PERT-CPM-graph


Regarding this file, one suggestion is to move this file into LOGOS/src/contrib/ folder. If you want to keep this file at the CPM folder and made some modifications, I would suggest to convert it to RAVEN code standards.

file has been edited according to RAVEN code standards

wangcj05 · 2023-03-27T16:02:51Z

tests/test_BaseCPMmodel.xml

+    <ExternalModel name="CPMmodel" subType="LOGOS.BaseCPMmodel">
+      <variables>A,B,C,D,E,F,G,H,end_time</variables>
+      <CPtime>end_time</CPtime>
+      <map var='A'>start</map>
+      <map var='B'>b</map>
+      <map var='C'>c</map>
+      <map var='D'>d</map>
+      <map var='E'>end</map>
+      <map var='F'>f</map>
+      <map var='G'>g</map>
+      <map var='H'>h</map>
+    </ExternalModel>


I guess you need to convert the python graphModel construction into XML format

This structure has been modified, now it is possible to import graph structure of a schedule from xml block

wangcj05 · 2023-03-27T16:04:36Z

tests/CPMmodel/graphModel.py

+class project():
+  start = Activity("start", 10)
+  b     = Activity("b",     20)
+  c     = Activity("c",      5)
+  d     = Activity("d",     10)
+  f     = Activity("f",     15)
+  g     = Activity("g",      5)
+  h     = Activity("h",     15)
+  end   = Activity("end",   20)
+
+  activitiesList = [start,b,c,d,f,g,h,end]
+
+  graph = {start: [f,b,h], 
+           b    : [c], 
+           c    : [g,d], 
+           d    : [end], 
+           f    : [g], 
+           g    : [end],
+           h    : [end],
+           end  : []}
+


Do the users need to create the graphModel? or they only need to provide the inputs through input xml, and we can automatically create the graph model?

There are two methods to import a schedule: the first one is to directly import it in an xml format in the RAVEN input file. The second one is to create a project class which contains all the activities and the graph structure. This second one will be updated once we get specifications of schedule formats coming from software scheduling tools such as P6

mandd · 2023-04-13T21:26:54Z

@wangcj05 : I think all the initial set of comments have been addressed

wangcj05

Some general comments for you to consider. @mandd

wangcj05 · 2023-04-13T22:04:30Z

src/CPM/PertMain2.py

+      self.infoDict[activity]["slack"] = self.infoDict[activity]["lf"] - self.infoDict[activity]["ef"]
+
+  # add activity to the pert
+  def addActivity(self, activity, in_connections=[], out_connections=[]):


camelBack to replace underscore for variables?

wangcj05 · 2023-04-13T22:04:54Z

src/CPM/PertMain2.py

+      @ In, None
+      @ Out, CPdict, dict, dictionary of activities included in the CP alonf with their corresponding duration
+    """
+    critical_path = self.getCriticalPath()


wangcj05 · 2023-04-13T22:06:12Z

tests/test_BaseCPMmodel.xml

+    <Sequence>simRun</Sequence>
+    <batchSize>1</batchSize>
+  </RunInfo>
+


Could you add a TestInfo node block

wangcj05 · 2023-04-13T22:07:54Z

tests/tests

+
+ [./CPMmodel_map]
+  type  = 'RavenFramework'
+  input = 'test_BaseCPMmodel_map.xml'


It seems you do not add this file yet.

wangcj05

the folder in the tests file is not correct, please update it.

wangcj05 · 2023-04-14T04:06:35Z

tests/tests

+ [./CPMmodel]
+  type  = 'RavenFramework'
+  input = 'test_BaseCPMmodel.xml'
+  UnorderedCsv = 'MultipleKnapsack/Print_sim_PS.csv'


please update the folder to CPMmodel

wangcj05 · 2023-04-14T04:06:54Z

tests/tests

+ [./CPMmodel_map]
+  type  = 'RavenFramework'
+  input = 'test_BaseCPMmodel_map.xml'
+  UnorderedCsv = 'MultipleKnapsack/Print_sim_PS_map.csv'


please update the folder to CPMmodel

…to mandd/CMPmodel

wangcj05 · 2023-04-14T19:11:54Z

Contributions from reviewer only for resolving libraries issues.

wangcj05 · 2023-04-14T19:24:00Z

PR checklist is good.

CPM model files (draft)

559631e

mandd requested a review from wangcj05 March 24, 2023 22:53

wangcj05 reviewed Mar 27, 2023

View reviewed changes

addressing first comments from Congjian

6c69c73

mandd changed the title ~~[WIP] CPM model~~ CPM model Apr 13, 2023

mandd added 2 commits April 13, 2023 14:55

delete whitespaces

e3d7cc9

added docs

feee301

wangcj05 requested changes Apr 13, 2023

View reviewed changes

mandd and others added 2 commits April 13, 2023 17:13

added missing files and addressing comments

1bf2ed4

downgrade pyomo version to 6.4

7504078

wangcj05 requested changes Apr 14, 2023

View reviewed changes

wangcj05 and others added 4 commits April 13, 2023 22:19

typo

ee4ab29

fixed typos

7fa067e

downgrade coincbc to 2.10.5

82845e7

Merge branch 'mandd/CMPmodel' of https://github.com/idaholab/LOGOS in…

aee117e

…to mandd/CMPmodel

wangcj05 approved these changes Apr 14, 2023

View reviewed changes

wangcj05 merged commit 4f9470f into devel Apr 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CPM model #49

CPM model #49

mandd commented Mar 24, 2023 •

edited

Loading

mandd commented Mar 24, 2023

mandd commented Mar 24, 2023 •

edited

Loading

wangcj05 left a comment

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

wangcj05 Mar 27, 2023

mandd Apr 13, 2023

mandd commented Apr 13, 2023

wangcj05 left a comment

wangcj05 Apr 13, 2023

mandd Apr 13, 2023

wangcj05 Apr 13, 2023

mandd Apr 13, 2023

wangcj05 Apr 13, 2023

mandd Apr 13, 2023

wangcj05 Apr 13, 2023

mandd Apr 13, 2023

wangcj05 left a comment

wangcj05 Apr 14, 2023

mandd Apr 14, 2023

wangcj05 Apr 14, 2023

mandd Apr 14, 2023

wangcj05 commented Apr 14, 2023

wangcj05 commented Apr 14, 2023


		self.pert = Pert(self.graph)

		end_time = self.pert.info_dict[self.pert.end_activity]['ef']

		@@ -0,0 +1,261 @@
		# Developed from: https://github.com/nofaralfasi/PERT-CPM-graph

CPM model #49

CPM model #49

Conversation

mandd commented Mar 24, 2023 • edited Loading

Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

What are the significant changes in functionality due to this change request?

For Change Control Board: Change Request Review

mandd commented Mar 24, 2023

mandd commented Mar 24, 2023 • edited Loading

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mandd commented Apr 13, 2023

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangcj05 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangcj05 commented Apr 14, 2023

wangcj05 commented Apr 14, 2023

mandd commented Mar 24, 2023 •

edited

Loading

mandd commented Mar 24, 2023 •

edited

Loading