Changeset 1183

Timestamp:

10/16/22 14:23:57 (2 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/common/nonstd_span.h (modified) (1 diff)
• cpp/frams/config/f0-SDK.def (modified) (5 diffs)
• cpp/frams/config/f0.def (modified) (5 diffs)
• cpp/frams/genetics/genoconv.cpp (modified) (1 diff)
• cpp/frams/model/defassign-f0-SDK.h (modified) (1 diff)
• cpp/frams/model/f0-SDK-classes.h (modified) (5 diffs)
• cpp/frams/model/modelobj.cpp (modified) (1 diff)
• framspy/frams-test.py (modified) (1 diff)

cpp/common/nonstd_span.h

@@ -13 +13 @@
         constexpr span() noexcept
         {
-                data_ = NULL; size_ = 0;
+                data_ = NULL;
+                size_ = 0;
         }
         constexpr span(ElementType* first, size_t count) noexcept
         {
-                data_ = first; size_ = count;
+                data_ = first;
+                size_ = count;
         }
         constexpr span(ElementType* first, ElementType* end) noexcept
         {
-                data_ = first; size_ = end - first;
+                data_ = first;
+                size_ = end - first;
         }
         template<size_t N> constexpr span(ElementType(&arr)[N]) noexcept
         {
-                data_ = arr; size_ = N;
+                data_ = arr;
+                size_ = N;
         }
 

cpp/frams/config/f0-SDK.def

@@ -3 +3 @@
 GROUP(Visual)
 PROP(se,0,1024,startenergy,f,,,,startenergy)
-PROP(Vstyle,1,0,vis_style,s,0,0,,vis_style)
+PROP(Vstyle,1,0,Visual style,s,0,0,,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,vis_style,s,0,0,part,vis_style)
+PROP(Vstyle,2,0,Visual style,s,0,0,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,vis_style,s,0,0,joint,vis_style)
+PROP(Vstyle,3,0,Visual style,s,0,0,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,vis_style,s,0,0,joint,vis_style)
+PROP(Vstyle,3,0,Visual style,s,0,0,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,vis_style,s,0,0,neuro,vis_style)
+PROP(Vstyle,2,0,Visual style,s,0,0,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,vis_style,s,0,0,,vis_style)
+PROP(Vstyle,1,0,Visual style,s,0,0,,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,vis_style,s,0,0,part,vis_style)
+PROP(Vstyle,2,0,Visual style,s,0,0,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,vis_style,s,0,0,joint,vis_style)
+PROP(Vstyle,3,0,Visual style,s,0,0,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,vis_style,s,0,0,joint,vis_style)
+PROP(Vstyle,3,0,Visual style,s,0,0,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,vis_style,s,0,0,neuro,vis_style)
+PROP(Vstyle,2,0,Visual style,s,0,0,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/genoconv.cpp

@@ -19 +19 @@
 ///////////////////////////////////////////////////////////////////////////
 
-GenoConvParam::GenoConvParam(GenoConvManager *g) :Param(0), gcm(g)
+GenoConvParam::GenoConvParam(GenoConvManager *g) :Param(), gcm(g)
 {
         updatetab();

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

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 

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

@@ -10 +10 @@
  {"Visual",},
  {"se",0,1024,"startenergy","f",FIELD(startenergy),},
- {"Vstyle",1,0,"vis_style","s 0 0 ",FIELD(vis_style),},
+ {"Vstyle",1,0,"Visual style","s 0 0 ",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,"vis_style","s 0 0 part",FIELD(vis_style),},
+ {"Vstyle",2,0,"Visual style","s 0 0 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,"vis_style","s 0 0 joint",FIELD(vis_style),},
+ {"Vstyle",3,0,"Visual style","s 0 0 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,"vis_style","s 0 0 joint",FIELD(vis_style),},
+ {"Vstyle",3,0,"Visual style","s 0 0 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,"vis_style","s 0 0 neuro",FIELD(vis_style),},
+ {"Vstyle",2,0,"Visual style","s 0 0 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/model/modelobj.cpp

@@ -9 +9 @@
         { "Model", 1, 21, "Model", },
         { "se", 0, PARAM_NOSTATIC, "startenergy", "f", FIELD(startenergy), },
-        { "Vstyle", 0, PARAM_NOSTATIC, "vis_style", "s", FIELD(vis_style), },
+        { "Vstyle", 0, PARAM_NOSTATIC, "Visual style", "s", FIELD(vis_style), "See the \"Visual style definition\" context for more information"},
 
         { "geno", 0, PARAM_NOSTATIC | PARAM_READONLY, "Geno", "oGeno", GETONLY(geno), },

framspy/frams-test.py

@@ -102 +102 @@
 # sampling a Model in 3D
 geno = "RXX(X,CXXX)"
-print("\nNow build a Model from the genotype '%s' and sample it in 3D, then print a 2D projection" % geno)
+print("\nNow build a Model from the genotype '%s' and sample it in 3D, then print a 2D projection." % geno)
 import numpy as np