Changeset 1183


Ignore:
Timestamp:
10/16/22 14:23:57 (7 weeks ago)
Author:
Maciej Komosinski
Message:

Cosmetic

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • cpp/common/nonstd_span.h

    r1179 r1183  
    1313        constexpr span() noexcept
    1414        {
    15                 data_ = NULL; size_ = 0;
     15                data_ = NULL;
     16                size_ = 0;
    1617        }
    1718        constexpr span(ElementType* first, size_t count) noexcept
    1819        {
    19                 data_ = first; size_ = count;
     20                data_ = first;
     21                size_ = count;
    2022        }
    2123        constexpr span(ElementType* first, ElementType* end) noexcept
    2224        {
    23                 data_ = first; size_ = end - first;
     25                data_ = first;
     26                size_ = end - first;
    2427        }
    2528        template<size_t N> constexpr span(ElementType(&arr)[N]) noexcept
    2629        {
    27                 data_ = arr; size_ = N;
     30                data_ = arr;
     31                size_ = N;
    2832        }
    2933
  • cpp/frams/config/f0-SDK.def

    r1142 r1183  
    33GROUP(Visual)
    44PROP(se,0,1024,startenergy,f,,,,startenergy)
    5 PROP(Vstyle,1,0,vis_style,s,0,0,,vis_style)
     5PROP(Vstyle,1,0,Visual style,s,0,0,,vis_style,,``See the \"Visual style definition\" context for more information'')
    66ENDCLASS
    77
     
    2727PROP(rz,0,1024,rot.z,f,,,,rot.z)
    2828PROP(i,1,0,`info',s,,,,info)
    29 PROP(Vstyle,2,0,vis_style,s,0,0,part,vis_style)
     29PROP(Vstyle,2,0,Visual style,s,0,0,part,vis_style,,``See the \"Visual style definition\" context for more information'')
    3030XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
    3131XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    6666PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
    6767PROP(i,2,0,`info',s,,,,info)
    68 PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
     68PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
    6969XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    7070XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    9494PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
    9595PROP(i,2,0,`info',s,,,,info)
    96 PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
     96PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
    9797XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    9898XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    108108PROP(d,1,0,details,s,,,N,details,GETSET)
    109109PROP(i,1,0,`info',s,,,,info)
    110 PROP(Vstyle,2,0,vis_style,s,0,0,neuro,vis_style)
     110PROP(Vstyle,2,0,Visual style,s,0,0,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
    111111PROP(getInputCount,0,1+2,`input count',d,,,,inputCount,GETONLY)
    112112PROP(getInputNeuroDef,0,0,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)
  • cpp/frams/config/f0.def

    r1142 r1183  
    33GROUP(Visual)
    44PROP(se,0,1024,startenergy,f,,,,startenergy)
    5 PROP(Vstyle,1,0,vis_style,s,0,0,,vis_style)
     5PROP(Vstyle,1,0,Visual style,s,0,0,,vis_style,,``See the \"Visual style definition\" context for more information'')
    66ENDCLASS
    77
     
    2727PROP(rz,0,1024,rot.z,f,,,,rot.z)
    2828PROP(i,1,0,`info',s,,,,info)
    29 PROP(Vstyle,2,0,vis_style,s,0,0,part,vis_style)
     29PROP(Vstyle,2,0,Visual style,s,0,0,part,vis_style,,``See the \"Visual style definition\" context for more information'')
    3030XPROP(vr,2,0,red component,f,0.0,1.0,0.5,vcolor.x)
    3131XPROP(vg,2,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    6666PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
    6767PROP(i,2,0,`info',s,,,,info)
    68 PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
     68PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
    6969XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    7070XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    9494PROP(stam,2,0,stamina,f,0.0,1.0,0.25,stamina)
    9595PROP(i,2,0,`info',s,,,,info)
    96 PROP(Vstyle,3,0,vis_style,s,0,0,joint,vis_style)
     96PROP(Vstyle,3,0,Visual style,s,0,0,joint,vis_style,,``See the \"Visual style definition\" context for more information'')
    9797XPROP(vr,3,0,red component,f,0.0,1.0,0.5,vcolor.x)
    9898XPROP(vg,3,1024,green component,f,0.0,1.0,0.5,vcolor.y)
     
    108108PROP(d,1,0,details,s,,,N,details,GETSET)
    109109PROP(i,1,0,`info',s,,,,info)
    110 PROP(Vstyle,2,0,vis_style,s,0,0,neuro,vis_style)
     110PROP(Vstyle,2,0,Visual style,s,0,0,neuro,vis_style,,``See the \"Visual style definition\" context for more information'')
    111111PROP(getInputCount,0,1+2,`input count',d,,,,inputCount,GETONLY)
    112112PROP(getInputNeuroDef,0,0,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)
  • cpp/frams/genetics/genoconv.cpp

    r988 r1183  
    1919///////////////////////////////////////////////////////////////////////////
    2020
    21 GenoConvParam::GenoConvParam(GenoConvManager *g) :Param(0), gcm(g)
     21GenoConvParam::GenoConvParam(GenoConvManager *g) :Param(), gcm(g)
    2222{
    2323        updatetab();
  • cpp/frams/model/defassign-f0-SDK.h

    r1142 r1183  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
  • cpp/frams/model/f0-SDK-classes.h

    r1142 r1183  
    1010 {"Visual",},
    1111 {"se",0,1024,"startenergy","f",FIELD(startenergy),},
    12  {"Vstyle",1,0,"vis_style","s 0 0 ",FIELD(vis_style),},
     12 {"Vstyle",1,0,"Visual style","s 0 0 ",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
    1313 {0,0,0,}
    1414};
     
    4444 {"rz",0,1024,"rot.z","f",FIELD(rot.z),},
    4545 {"i",1,0,"info","s",FIELD(info),},
    46  {"Vstyle",2,0,"vis_style","s 0 0 part",FIELD(vis_style),},
     46 {"Vstyle",2,0,"Visual style","s 0 0 part",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
    4747 {"vr",2,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    4848 {"vg",2,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     
    111111 {"stam",2,0,"stamina","f 0.0 1.0 0.25",FIELD(stamina),},
    112112 {"i",2,0,"info","s",FIELD(info),},
    113  {"Vstyle",3,0,"vis_style","s 0 0 joint",FIELD(vis_style),},
     113 {"Vstyle",3,0,"Visual style","s 0 0 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
    114114 {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    115115 {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     
    154154 {"stam",2,0,"stamina","f 0.0 1.0 0.25",FIELD(stamina),},
    155155 {"i",2,0,"info","s",FIELD(info),},
    156  {"Vstyle",3,0,"vis_style","s 0 0 joint",FIELD(vis_style),},
     156 {"Vstyle",3,0,"Visual style","s 0 0 joint",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
    157157 {"vr",3,0,"red component","f 0.0 1.0 0.5",FIELD(vcolor.x),},
    158158 {"vg",3,1024,"green component","f 0.0 1.0 0.5",FIELD(vcolor.y),},
     
    183183 {"d",1,0,"details","s",GETSET(details),},
    184184 {"i",1,0,"info","s",FIELD(info),},
    185  {"Vstyle",2,0,"vis_style","s 0 0 neuro",FIELD(vis_style),},
     185 {"Vstyle",2,0,"Visual style","s 0 0 neuro",FIELD(vis_style),"See the \"Visual style definition\" context for more information",},
    186186 {"getInputCount",0,1+2,"input count","d",GETONLY(inputCount),},
    187187 {"getInputNeuroDef",0,0,"get input neuron","p oNeuroDef(d)",PROCEDURE(p_getInputNeuroDef),},
  • cpp/frams/model/modelobj.cpp

    r1158 r1183  
    99        { "Model", 1, 21, "Model", },
    1010        { "se", 0, PARAM_NOSTATIC, "startenergy", "f", FIELD(startenergy), },
    11         { "Vstyle", 0, PARAM_NOSTATIC, "vis_style", "s", FIELD(vis_style), },
     11        { "Vstyle", 0, PARAM_NOSTATIC, "Visual style", "s", FIELD(vis_style), "See the \"Visual style definition\" context for more information"},
    1212
    1313        { "geno", 0, PARAM_NOSTATIC | PARAM_READONLY, "Geno", "oGeno", GETONLY(geno), },
  • framspy/frams-test.py

    r1162 r1183  
    102102# sampling a Model in 3D
    103103geno = "RXX(X,CXXX)"
    104 print("\nNow build a Model from the genotype '%s' and sample it in 3D, then print a 2D projection" % geno)
     104print("\nNow build a Model from the genotype '%s' and sample it in 3D, then print a 2D projection." % geno)
    105105import numpy as np
    106106
Note: See TracChangeset for help on using the changeset viewer.