Prechádzať zdrojové kódy

Added new string_split_nr function

Yentl Van Tendeloo 7 rokov pred
rodič
commit
c175480a0b

+ 5 - 4
bootstrap/core_algorithm.alc

@@ -2280,11 +2280,11 @@ Void function user_function_skip_init(user_id : String):
 		elif (cmd == "model_list_full"):
 			output(cmd_model_list_full(single_input("Location?")))
 		elif (cmd == "transformation_add_MANUAL"):
-			output(cmd_transformation_add_MANUAL(dict_input("Source model names?"), dict_input("Target model names?"), single_input("Operation name?")))
+			output(cmd_transformation_add_MANUAL(dict_input("Source models?"), dict_input("Target models?"), single_input("Operation name?")))
 		elif (cmd == "transformation_add_AL"):
-			output(cmd_transformation_add_AL(dict_input("Source model names?"), dict_input("Target model names?"), single_input("Operation name?")))
+			output(cmd_transformation_add_AL(dict_input("Source models?"), dict_input("Target models?"), single_input("Operation name?")))
 		elif (cmd == "transformation_add_MT"):
-			output(cmd_transformation_add_MT(dict_input("Source model names?"), dict_input("Target models?"), single_input("Operation name?")))
+			output(cmd_transformation_add_MT(dict_input("Source models?"), dict_input("Target models?"), single_input("Operation name?")))
 		elif (cmd == "permission_modify"):
 			output(cmd_permission_modify(single_input("Model name?"), single_input("Permissions?")))
 		elif (cmd == "permission_owner"):
@@ -2334,8 +2334,9 @@ Void function user_function_skip_init(user_id : String):
 		elif (cmd == "folder_create"):
 			output(cmd_folder_create(single_input("Folder name?")))
 		elif (cmd == "add_conformance"):
-			// TODO
+			log("Adding conformance relation...")
 			output(cmd_conformance_add(single_input("Model name?"), single_input("Metamodel name?")))
+			log("Added!")
 		elif (cmd == "remove_conformance"):
 			// TODO
 			cmd = "FAIL"

+ 14 - 0
bootstrap/utils.alc

@@ -91,6 +91,20 @@ Void function list_extend(lst : Element, ext : Element):
 String function get_taskname():
 	return reverseKeyLookup(read_root(), read_taskroot())!
 
+Element function string_split_nr(str : String, split : String, count : Integer):
+	Element splitted
+	String new
+
+	splitted = string_split(str, split)
+	count = count + 1
+
+	while (list_len(splitted) > count):
+		new = split + cast_string(list_pop_final(splitted))
+		new = cast_string(list_pop_final(splitted)) + new
+		list_append(splitted, new)
+
+	return splitted!
+
 Element function alphabet():
 	Element chars
 	chars = list_create()

+ 1 - 0
interface/HUTN/includes/utils.alh

@@ -5,3 +5,4 @@ Void function list_extend(lst : Element, ext : Element)
 String function get_taskname()
 Void function sleep(seconds : Float)
 Element function alphabet()
+Element function string_split_nr(str : String, split : String, count : Integer)

+ 0 - 4
wrappers/classes/modelverse.xml

@@ -392,10 +392,6 @@
                             <script>
                                 self.registered_metamodel[self.parameters[0]] = self.parameters[1]
                             </script>
-
-                            <raise event="result">
-                                <parameter expr="None"/>
-                            </raise>
                         </transition>
                     </state>
 

+ 1 - 1
wrappers/modelverse.py

@@ -133,7 +133,7 @@ def model_render(model_name, mapper_name, rendered_name):
     INPUT("model_render", None, [model_name, mapper_name, rendered_name])
     return OUTPUT()
 
-def transformation_between(source, target):
+def transformation_between(sources, targets):
     INPUT("transformation_between", None, [source, target])
     return OUTPUT()