Changeset 830 for cpp/frams

Timestamp:

11/26/18 00:00:16 (5 years ago)

Author:

Maciej Komosinski

Message:

"%ld" replaced with "%d" because it refers to int

Location:

cpp/frams/genetics

Files:

• f1/f1_conv.cpp (modified) (1 diff)
• f4/f4_conv.cpp (modified) (3 diffs)
• f4/f4_general.cpp (modified) (1 diff)

cpp/frams/genetics/f1/f1_conv.cpp

@@ -274 +274 @@
 {
         double len = min(2.0, c.length);
-        sprintf(tmp, "p1=%ld,p2=%ld,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
+        sprintf(tmp, "p1=%d,p2=%d,dx=%lg,rx=%lg,ry=%lg,rz=%lg,stam=%lg,vr=%g,vg=%g,vb=%g",
                 part1, part2, len, angle.x, angle.y, angle.z, c.stamina, c.cred, c.cgreen, c.cblue);
         lastjoint_muscle_power = c.muscle_power;

cpp/frams/genetics/f4/f4_conv.cpp

@@ -217 +217 @@
                 if ((jj_p1_refno < 0) || (jj_p1_refno >= getPartCount())) return -11;
                 if ((jj_p2_refno < 0) || (jj_p2_refno >= getPartCount())) return -12;
-                sprintf(tmpLine, "p1=%ld,p2=%ld,dx=%g,dy=0,dz=0,rx=%g,ry=0,rz=%g"\
+                sprintf(tmpLine, "p1=%d,p2=%d,dx=%g,dy=0,dz=0,rx=%g,ry=0,rz=%g"\
                         ",stam=%g",
                         jj_p1_refno, jj_p2_refno,
@@ -244 +244 @@
                                 partno = C->dadlink->p2_refno;
                                 if ((partno < 0) || (partno >= getPartCount())) return -21;
-                                else sprintf(tmpLine, "p=%ld,d=\"N:in=%g,fo=%g,si=%g\"", partno, C->inertia, C->force, C->sigmo);
+                                else sprintf(tmpLine, "p=%d,d=\"N:in=%g,fo=%g,si=%g\"", partno, C->inertia, C->force, C->sigmo);
                         }
                         else
@@ -265 +265 @@
                         else
                         {
-                                sprintf(tmpLine, "p=%ld,d=\"%s\"", partno, nclass);
+                                sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
                         }
                         partidx = addFromString(NeuronType, tmpLine, &range);

cpp/frams/genetics/f4/f4_general.cpp

@@ -1255 +1255 @@
                         else
                         {
-                                sprintf(buf2, "%ld", l1);
+                                sprintf(buf2, "%d", l1);
                                 out += buf2;
                         }