Changeset 1186

Timestamp:

11/20/22 20:32:43 (2 years ago)

Author:

Maciej Komosinski

Message:

For consistency with other numerical types, unlimited string length is now indicated by "-1" as the second value of the definition of the "s" property

Location:

cpp/frams

Files:

• _demos/loader_test_param.cpp (modified) (1 diff)
• config/f0-SDK.def (modified) (5 diffs)
• config/f0.def (modified) (5 diffs)
• genetics/fn/fn_oper.cpp (modified) (1 diff)
• model/f0-SDK-classes.h (modified) (5 diffs)
• param/param.cpp (modified) (2 diffs)

cpp/frams/_demos/loader_test_param.cpp

@@ -37 +37 @@
         { "Data", 1, 16, "data", },
         { "text", 0, 0, "Text", "s 0 10", FIELD(text), }, // 10 = length limit
-        { "longtext", 0, 0, "Long text", "s 1", FIELD(longtext), }, // 1 = multiline, 0 = unlimited
-        { "deftext", 0, 0, "Text with default value", "s 0 0 some text", FIELD(deftext), },
+        { "longtext", 0, 0, "Long text", "s 1", FIELD(longtext), }, // 1 = multiline, -1 = unlimited
+        { "deftext", 0, 0, "Text with default value", "s 0 -1 some text", FIELD(deftext), },
         { "i1", 0, 0, "Integer 1", "d", FIELD(i1), },          // unrestricted integer
         { "i2", 0, 0, "Integer 2", "d -5 5 1", FIELD(i2), }, // [-5..5] integer, default=1

cpp/frams/config/f0-SDK.def

@@ -3 +3 @@
 GROUP(Visual)
 PROP(se,0,1024,startenergy,f,,,,startenergy)
-PROP(Vstyle,1,0,Visual style,s,0,0,,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,1,0,Visual style,s,0,-1,,vis_style,,``See the \"Visual style definition\" context for more information'')
 ENDCLASS
 
@@ -27 +27 @@
 PROP(rz,0,1024,rot.z,f,,,,rot.z)
 PROP(i,1,0,`info',s,,,,info)
-PROP(Vstyle,2,0,Visual style,s,0,0,part,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,2,0,Visual style,s,0,-1,part,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -66 +66 @@
 PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
 PROP(i,2,0,`info',s,,,,info)
-PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,3,0,Visual style,s,0,-1,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -94 +94 @@
 PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
 PROP(i,2,0,`info',s,,,,info)
-PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,3,0,Visual style,s,0,-1,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -108 +108 @@
 PROP(d,1,0,details,s,,,N,details,GETSET)
 PROP(i,1,0,`info',s,,,,info)
-PROP(Vstyle,2,0,Visual style,s,0,0,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,2,0,Visual style,s,0,-1,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
 PROP(getInputCount,0,1+2,`input count',d,,,,inputCount,GETONLY)
 PROP(getInputNeuroDef,0,0,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)

cpp/frams/config/f0.def

@@ -3 +3 @@
 GROUP(Visual)
 PROP(se,0,1024,startenergy,f,,,,startenergy)
-PROP(Vstyle,1,0,Visual style,s,0,0,,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,1,0,Visual style,s,0,-1,,vis_style,,``See the \"Visual style definition\" context for more information'')
 ENDCLASS
 
@@ -27 +27 @@
 PROP(rz,0,1024,rot.z,f,,,,rot.z)
 PROP(i,1,0,`info',s,,,,info)
-PROP(Vstyle,2,0,Visual style,s,0,0,part,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,2,0,Visual style,s,0,-1,part,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -66 +66 @@
 PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
 PROP(i,2,0,`info',s,,,,info)
-PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,3,0,Visual style,s,0,-1,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -94 +94 @@
 PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
 PROP(i,2,0,`info',s,,,,info)
-PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,3,0,Visual style,s,0,-1,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
 XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
 XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
@@ -108 +108 @@
 PROP(d,1,0,details,s,,,N,details,GETSET)
 PROP(i,1,0,`info',s,,,,info)
-PROP(Vstyle,2,0,Visual style,s,0,0,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
+PROP(Vstyle,2,0,Visual style,s,0,-1,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
 PROP(getInputCount,0,1+2,`input count',d,,,,inputCount,GETONLY)
 PROP(getInputNeuroDef,0,0,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)

cpp/frams/genetics/fn/fn_oper.cpp

@@ -27 +27 @@
         { "fn_xover", 0, 0, "Fraction inherited in linear mix crossover", "f 0.5 1.0 0.9", FIELD(xover_proportion), "0.5 => children are averaged parents.\n0.8 => children are only 20% different from parents.\n1.0 => each child is identical to one parent (no crossover).", },
         { "fn_xover_random", 0, 0, "Random fraction inherited in crossover", "d 0 1 1", FIELD(xover_proportion_random), "If active, the amount of linear mix is random in each crossover operation, so the \"Fraction inherited in linear mix crossover\" parameter is ignored.", },
-        { "fn_mut_bound_low", 1, 0, "Lower bounds for mutation", "s 0 0 [-10.0, -10.0]", FIELD(mut_bound_low), "A vector of lower bounds (one real value for each variable)", },
-        { "fn_mut_bound_high", 1, 0, "Higher bounds for mutation", "s 0 0 [10.0, 10.0]", FIELD(mut_bound_high), "A vector of higher bounds (one real value for each variable)", },
-        { "fn_mut_stddev", 1, 0, "Standard deviations for mutation", "s 0 0 [0.1, 0.1]", FIELD(mut_stddev), "A vector of standard deviations (one real value for each variable)", },
+        { "fn_mut_bound_low", 1, 0, "Lower bounds for mutation", "s 0 -1 [-10.0, -10.0]", FIELD(mut_bound_low), "A vector of lower bounds (one real value for each variable)", },
+        { "fn_mut_bound_high", 1, 0, "Higher bounds for mutation", "s 0 -1 [10.0, 10.0]", FIELD(mut_bound_high), "A vector of higher bounds (one real value for each variable)", },
+        { "fn_mut_stddev", 1, 0, "Standard deviations for mutation", "s 0 -1 [0.1, 0.1]", FIELD(mut_stddev), "A vector of standard deviations (one real value for each variable)", },
         { "fn_mut_single_var", 0, 0, "Mutate only a single variable", "d 0 1 0", FIELD(mut_single_var), "If active, only a single randomly selected variable will be mutated in each mutation operation. Otherwise all variables will be mutated.", },
         { 0, },

cpp/frams/model/f0-SDK-classes.h

@@ -10 +10 @@
  {"Visual",},
  {"se",0,1024,"startenergy","f",FIELD(startenergy),},
- {"Vstyle",1,0,"Visual style","s 0 0 ",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
+ {"Vstyle",1,0,"Visual style","s 0 -1 ",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
  {0,0,0,}
 };
@@ -44 +44 @@
  {"rz",0,1024,"rot.z","f",FIELD(rot.z),},
  {"i",1,0,"info","s",FIELD(info),},
- {"Vstyle",2,0,"Visual style","s 0 0 part",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
+ {"Vstyle",2,0,"Visual style","s 0 -1 part",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
  {"vr",2,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
  {"vg",2,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
@@ -111 +111 @@
  {"stam",2,0,"stamina","f 0.0 1.0 0.25",FIELD(stamina),},
  {"i",2,0,"info","s",FIELD(info),},
- {"Vstyle",3,0,"Visual style","s 0 0 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
+ {"Vstyle",3,0,"Visual style","s 0 -1 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
  {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
  {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
@@ -154 +154 @@
  {"stam",2,0,"stamina","f 0.0 1.0 0.25",FIELD(stamina),},
  {"i",2,0,"info","s",FIELD(info),},
- {"Vstyle",3,0,"Visual style","s 0 0 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
+ {"Vstyle",3,0,"Visual style","s 0 -1 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
  {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
  {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
@@ -183 +183 @@
  {"d",1,0,"details","s",GETSET(details),},
  {"i",1,0,"info","s",FIELD(info),},
- {"Vstyle",2,0,"Visual style","s 0 0 neuro",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
+ {"Vstyle",2,0,"Visual style","s 0 -1 neuro",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
  {"getInputCount",0,1+2,"input count","d",GETONLY(inputCount),},
  {"getInputNeuroDef",0,0,"get input neuron","p oNeuroDef(d)",PROCEDURE(p_getInputNeuroDef),},

cpp/frams/param/param.cpp

@@ -909 +909 @@
                 //if (have == 1) return false; //not sure?
                 if ((have >= 1) && (!((a == 0) || (a == 1)))) return false; // 'min' for string (single/multi) can be only 0 or 1
-                if ((have >= 2) && (b < 0)) return false; // max=0 means unlimited, max<0 is not allowed
+                if ((have >= 2) && (b < -1)) return false; // max=-1 means unlimited, >=0 is max len, max<-1 is not allowed
         }
         break;
@@ -1162 +1162 @@
         if (sscanf(t, "%d %d", &mn, &mx) == 2) //using getMinMax would also get default value, which is not needed here
         {
-                if ((x.length() > mx) && (mx > 0))
+                if ((x.length() > mx) && (mx >= 0))
                 {
                         vs = x.substr(0, mx);