Merge pull request #5 from deckamil/dev

Delivery into 0.3.0-alpha release milestone

Author: deckamil

MCG/MCG_CC/mcg_cc_file_checker.py

@@ -5,7 +5,7 @@
 #       responsible for checking of model module content from .exml file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           7 JUN 2023
+#   DATE:           23 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -39,12 +39,14 @@
 class FileChecker(object):
 
     # list of actions types
-    action_type_list = ["ADD", "SUB", "MUL", "DIV"]
+    action_3letter_type_list = ["ADD", "SUB", "MUL", "DIV", "AND", "NOT"]
+    action_2letter_type_list = ["OR", "EQ", "NE", "GT", "LT", "GE", "LE"]
 
     # list of interface element types
     interface_element_type_list = ["INT8", "INT16", "INT32", "INT64",
                                    "UINT8", "UINT16", "UINT32", "UINT64",
-                                   "FLOAT32", "FLOAT64"]
+                                   "FLOAT32", "FLOAT64",
+                                   "BOOL"]
 
     # Description:
     # This is class constructor.
@@ -93,14 +95,27 @@ def check_action_type(action_type_ref):
         # result flag
         action_type_valid = False
 
-        # for all possible action types
-        for action_type in FileChecker.action_type_list:
-            # if action type is the same as in reference
-            if action_type == action_type_ref[0:3]:
-                # set flag
-                action_type_valid = True
-                # exit loop
-                break
+        # is valid type is not found
+        if not action_type_valid:
+            # check all possible 3-letter action types
+            for action_type in FileChecker.action_3letter_type_list:
+                # if action type is the same as in reference
+                if action_type == action_type_ref[0:3]:
+                    # set flag
+                    action_type_valid = True
+                    # exit loop
+                    break
+
+        # is valid types is not found
+        if not action_type_valid:
+            # check 2-letter action types
+            for action_type in FileChecker.action_2letter_type_list:
+                # if action type is the same as in reference
+                if action_type == action_type_ref[0:2]:
+                    # set flag
+                    action_type_valid = True
+                    # exit loop
+                    break
 
         # return flag
         return action_type_valid

MCG/MCG_CC/mcg_cc_file_reader.py

@@ -5,7 +5,7 @@
 #       responsible for reading of module content from .exml file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           21 JAN 2023
+#   DATE:           24 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -388,8 +388,18 @@ def read_interaction_targets(self):
                             Logger.save_in_log_file("FileReader", "Have found " + str(connection) + " connection",
                                                     False)
 
-                    # if end of target section if found
-                    if "</COMP>" in self.activity_file[j]:
+                    # if end of action target section is found
+                    if "</COMP>" in self.activity_file[j] and \
+                            source_interaction_type == Connection.ACTION:
+                        # exit "for j in range" loop
+                        break
+
+                    # if end of operation target section is found
+                    if "</COMP>" in self.activity_file[j] and \
+                            "</DEPENDENCIES>" in self.activity_file[j+1] and \
+                            "</OBJECT>" in self.activity_file[j+2] and \
+                            "</COMP>" in self.activity_file[j+3] and \
+                            source_interaction_type == Connection.OPERATION:
                         # exit "for j in range" loop
                         break
 

MCG/MCG_CC/mcg_cc_main.py

@@ -7,7 +7,7 @@
 #       file.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           10 JUN 2023
+#   DATE:           25 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -55,7 +55,7 @@ class Main(object):
     OUTPUT_DIR_PATH_INDEX = 2
 
     # MCG CC version
-    MCG_CC_VERSION = "v0.2.0-alpha"
+    MCG_CC_VERSION = "v0.3.0-alpha"
 
     # Description:
     # This is main method, which display short notice and start conversion process.
@@ -142,15 +142,15 @@ def convert_model():
                 # check errors
                 ErrorHandler.check_errors()
 
-                # initialize sorter
+                # initialize module sorter
                 module_sorter = ModuleSorter(file_reader_list)
                 # sort module content
                 module_sorter_list = module_sorter.sort_module()
 
                 # check errors
                 ErrorHandler.check_errors()
 
-                # initialize converter
+                # initialize module converter
                 module_converter = ModuleConverter(file_finder_list, file_reader_list, module_sorter_list)
                 # convert module content
                 module_converter.convert_module()

MCG/MCG_CC/mcg_cc_module_converter.py

@@ -5,7 +5,7 @@
 #       for conversion of module content into configuration file format.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           28 MAY 2023
+#   DATE:           23 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -240,8 +240,8 @@ def convert_operation_node(self, sorted_node):
             Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
 
     # Description:
-    # This method converts module specific action node into configuration file.
-    def convert_specific_action_node(self, sorted_node, math_symbol):
+    # This method converts module specific action node with n-argument operator into configuration file.
+    def convert_specific_action_node_arity_n(self, sorted_node, operator):
 
         # get output link
         output_link = sorted_node.output_data_list[0]
@@ -254,40 +254,78 @@ def convert_specific_action_node(self, sorted_node, math_symbol):
             input_data_name = input_link[Node.DATA_NAME_INDEX]
             # append input data element to conversion line
             conversion_line = conversion_line + str(input_data_name)
-            # append math symbol to conversion line
-            conversion_line = conversion_line + str(" ") + str(math_symbol) + str(" ")
+            # append operator to conversion line
+            conversion_line = conversion_line + str(" ") + str(operator) + str(" ")
 
-        # remove spare math symbol and whitespace
+        # remove spare operator and whitespace
         conversion_line = conversion_line[0:len(conversion_line) - 3]
         # append conversion line to configuration file
         self.configuration_file.append(conversion_line)
 
         # record info
         Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
 
+    # Description:
+    # This method converts module specific action node with 1-argument operator into configuration file.
+    def convert_specific_action_node_arity_1(self, sorted_node, operator):
+
+        # get input link
+        input_link = sorted_node.input_data_list[0]
+        # get output link
+        output_link = sorted_node.output_data_list[0]
+        # set beginning of action interaction to conversion line
+        conversion_line = str("$INS ") + str(output_link[Node.DATA_NAME_INDEX]) + str(" = ") + \
+                          str(operator) + str(input_link[Node.DATA_NAME_INDEX])
+
+        # append conversion line to configuration file
+        self.configuration_file.append(conversion_line)
+
+        # record info
+        Logger.save_in_log_file("ModuleConverter", "Have converted to " + str(conversion_line) + " line", False)
+
     # Description:
     # This method converts module action node into configuration file.
     def convert_action_node(self, sorted_node):
 
-        # if sorted node contains ADD action
+        # depending on the type of action, covert module node into configuration file.
         if sorted_node.name[0:3] == "ADD":
-            # convert ADD action
-            self.convert_specific_action_node(sorted_node, "+")
+            self.convert_specific_action_node_arity_n(sorted_node, "+")
 
-        # if sorted node contains SUB action
         elif sorted_node.name[0:3] == "SUB":
-            # convert SUB action
-            self.convert_specific_action_node(sorted_node, "-")
+            self.convert_specific_action_node_arity_n(sorted_node, "-")
 
-        # if sorted node contains MUL action
         elif sorted_node.name[0:3] == "MUL":
-            # convert MUL action
-            self.convert_specific_action_node(sorted_node, "*")
+            self.convert_specific_action_node_arity_n(sorted_node, "*")
 
-        # if sorted node contains DIV action
         elif sorted_node.name[0:3] == "DIV":
-            # convert DIV action
-            self.convert_specific_action_node(sorted_node, "/")
+            self.convert_specific_action_node_arity_n(sorted_node, "/")
+
+        elif sorted_node.name[0:3] == "AND":
+            self.convert_specific_action_node_arity_n(sorted_node, "&&")
+
+        elif sorted_node.name[0:3] == "NOT":
+            self.convert_specific_action_node_arity_1(sorted_node, "!")
+
+        elif sorted_node.name[0:2] == "OR":
+            self.convert_specific_action_node_arity_n(sorted_node, "||")
+
+        elif sorted_node.name[0:2] == "EQ":
+            self.convert_specific_action_node_arity_n(sorted_node, "==")
+
+        elif sorted_node.name[0:2] == "NE":
+            self.convert_specific_action_node_arity_n(sorted_node, "!=")
+
+        elif sorted_node.name[0:2] == "GT":
+            self.convert_specific_action_node_arity_n(sorted_node, ">")
+
+        elif sorted_node.name[0:2] == "LT":
+            self.convert_specific_action_node_arity_n(sorted_node, "LT")
+
+        elif sorted_node.name[0:2] == "GE":
+            self.convert_specific_action_node_arity_n(sorted_node, ">=")
+
+        elif sorted_node.name[0:2] == "LE":
+            self.convert_specific_action_node_arity_n(sorted_node, "<=")
 
     # Description:
     # This method converts module data node into configuration file.

MCG/MCG_CC/mcg_cc_module_sorter.py

@@ -5,7 +5,7 @@
 #       for finding and sorting of module nodes.
 #
 #   COPYRIGHT:      Copyright (C) 2021-2023 Kamil Deć github.com/deckamil
-#   DATE:           25 MAR 2023
+#   DATE:           24 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -42,7 +42,7 @@ class ModuleSorter(object):
     SORTED_NODE_LIST_INDEX = 0
 
     # list of action interaction that require to distinguish main data input
-    input_sensitivity_action_list = ["SUB", "DIV"]
+    input_sensitive_action_list = ["SUB", "DIV", "GT", "LT", "GE", "LE"]
 
     # Description:
     # This is class constructor.
@@ -248,10 +248,8 @@ def sort_nodes(self):
                     self.sorted_node_list.append(dependency[0])
                     # remove dependency sublist from dependency list
                     self.dependency_list.remove(dependency)
-                    # get output link
-                    output_link = dependency[0].output_data_list[0]
-                    # get output data name
-                    output_data_name = output_link[Node.DATA_NAME_INDEX]
+                    # get output data list
+                    output_data_list = dependency[0].output_data_list
                     # recalculate number of nodes to sort, i.e. length of dependency list
                     dependency_list_length = len(self.dependency_list)
 
@@ -267,15 +265,18 @@ def sort_nodes(self):
                             for k in range(index, len(dependency)):
                                 # if given node consumes local data elements, which comes from node, which
                                 # was appended above to sorted node list
-                                if output_data_name == dependency[index]:
-                                    # remove local data element from dependency sublist
-                                    dependency.remove(dependency[index])
-                                    # decrement index for next iteration, as one dependence was removed
-                                    # therefore all next dependencies in dependency sublist were pushed by
-                                    # one position towards beginning of the sublist, e.g. [...,A,B,C] -> [...,B,C];
-                                    # A was removed and now B is under previous position of A so at next
-                                    # iteration the same index need to be checked to examine B;
-                                    index = index - 1
+                                for output_link in output_data_list:
+                                    if output_link[Node.DATA_NAME_INDEX] == dependency[index]:
+                                        # remove local data element from dependency sublist
+                                        dependency.remove(dependency[index])
+                                        # decrement index for next iteration, as one dependence was removed
+                                        # therefore all next dependencies in dependency sublist were pushed by
+                                        # one position towards beginning of the sublist, e.g. [...,A,B,C] -> [...,B,C];
+                                        # A was removed and now B is under previous position of A so at next
+                                        # iteration the same index need to be checked to examine B;
+                                        index = index - 1
+                                        # exit "for output_link in" loop
+                                        break
                                 index = index + 1
 
                     # exit "for i in range" loop
@@ -311,8 +312,9 @@ def sort_input_data_list(self):
             if sorted_node.type == Node.ACTION:
 
                 # and if action is input sensitive, i.e. requires to distinguish main input data
-                for input_sensitivity_action in ModuleSorter.input_sensitivity_action_list:
-                    if sorted_node.name[0:3] == input_sensitivity_action:
+                for input_sensitive_action in ModuleSorter.input_sensitive_action_list:
+                    if (sorted_node.name[0:3] == input_sensitive_action) or \
+                            (sorted_node.name[0:2] == input_sensitive_action):
 
                         # get marker position
                         marker_position = sorted_node.name.find("+")
@@ -335,7 +337,7 @@ def sort_input_data_list(self):
                                 # record info
                                 Logger.save_in_log_file("ModuleSorter", "Have sorted " + str(sorted_node) + " node",
                                                         False)
-                                # exit "for input_data in" loop
+                                # exit "for input_link in" loop
                                 break
 
     # Description:

MCG/MCG_CGC/mcg_cgc_main.py

@@ -6,7 +6,7 @@
 #       to generate C code from the configuration file.
 #
 #   COPYRIGHT:      Copyright (C) 2022-2023 Kamil Deć github.com/deckamil
-#   DATE:           10 JUN 2023
+#   DATE:           25 JUN 2023
 #
 #   LICENSE:
 #       This file is part of Mod Code Generator (MCG).
@@ -51,7 +51,7 @@ class Main(object):
     OUTPUT_DIR_PATH_INDEX = 2
 
     # MCG CGC version
-    MCG_CGC_VERSION = "v0.2.0-alpha"
+    MCG_CGC_VERSION = "v0.3.0-alpha"
 
     # Description:
     # This is main method, which display short notice and start code generation process.