new instances + changes in number units and fix bug with stateset

reqtool/reqman/api/reqman/apps/reqtool/models/main_req.py

@@ -49,7 +49,7 @@ QUANTIFIER_CHOICES = ( ("NONE","NONE"), ("ALL", "ALL"), ("ONLY", "ONLY"),
                                 ("MORE THAN", "MORE THAN"), ("LESS THAN", "LESS THAN"), ("EXACTLY","EXACTLY"), 
                                 ("AT LEAST", "AT LEAST"), ("AT MOST", "AT MOST")
                      )
-NUMBER_UNITS_CHOICES = (("",""), ("METERS","METERS"), ("KILOMETERS","KILOMETERS"), ("VOLT","VOLT"))
+NUMBER_UNITS_CHOICES = (("",""),("m/s","m/s"), ("m/s^2","m/s^2"), ("m/s^3","m/s^3"), ("rad","rad"), ("rad/s","rad/s"), ("Hz","Hz"), ("METERS","METERS"), ("KILOMETERS","KILOMETERS"), ("VOLT","VOLT"))
 #ITEM
 ITEM_CHOICES = get_instances("SAO#Item")
 ITEM_CLASSES_COMMENTS = get_dmo_classes_and_comment("SAO#Item")

reqtool/reqman/api/reqman/apps/reqtool/models/suffix_req.py

@@ -18,7 +18,7 @@ SUFFIX_CHOICES = (("",""), ('S1', 'S1: <numerical-affirmative> j <closed-interva
                  )
 NUMERICAL_AFFIRMATIVE_CHOICES = (("MORE THAN", "MORE THAN"), ("LESS THAN", "LESS THAN"), ("EXACTLY","EXACTLY"), 
                                 ("AT LEAST", "AT LEAST"), ("AT MOST", "AT MOST"))
-NUMBER_UNITS_CHOICES = (("",""), ("METERS","METERS"), ("KILOMETERS","KILOMETERS"), ("VOLT","VOLT"))
+NUMBER_UNITS_CHOICES = (("",""),("m/s","m/s"), ("m/s^2","m/s^2"), ("m/s^3","m/s^3"), ("rad","rad"), ("rad/s","rad/s"), ("Hz","Hz"), ("METERS","METERS"), ("KILOMETERS","KILOMETERS"), ("VOLT","VOLT"))
 TIME_UNITS_CHOICES = (("SECONDS","SECONDS"), ("MINUTES","MINUTES"), ("MILLISECONDS","MILLISECONDS"), ("CYCLES","CYCLES"))
 FLOW_CHOICES = get_instances("SAO#Flow")
 # FLOW returns ()

reqtool/reqman/api/reqman/apps/reqtool/rest_api/services/inference.py

@@ -139,7 +139,12 @@ def findclassofmain(listofmain):
                                         classlist.append('M'+str(i+1))
                                         return(classlist)
                             if attrmain == "State":
-                                for sys in (STATE_CHOICES+ STATE_SET_CHOICES):
+                                for sys in (STATE_CHOICES):
+                                    if sys[0] ==  currentattr:
+                                        classlist.append('M'+str(i+1))
+                                        return(classlist)
+                            if attrmain == "StateSet":
+                                for sys in (STATE_SET_CHOICES):
                                     if sys[0] ==  currentattr:
                                         classlist.append('M'+str(i+1))
                                         return(classlist)