Changeset 36399

Timestamp:

Dec 17, 2013, 10:28:08 AM (13 years ago)

Author:

eugene

Message:

add cast function and floor, ceil, rint opihi math functions

Location:

branches/eam_branches/ipp-20131211/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (1 diff)
• cmd.data/cast.c (added)
• cmd.data/init.c (modified) (2 diffs)
• lib.shell/convert_to_RPN.c (modified) (1 diff)
• lib.shell/stack_math.c (modified) (3 diffs)

branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.data/Makefile

@@ -25 +25 @@
 $(SRC)/book.$(ARCH).o           \
 $(SRC)/book_commands.$(ARCH).o  \
+$(SRC)/cast.$(ARCH).o           \
 $(SRC)/center.$(ARCH).o \
 $(SRC)/clear.$(ARCH).o          \

branches/eam_branches/ipp-20131211/Ohana/src/opihi/cmd.data/init.c

@@ -10 +10 @@
 int center           PROTO((int, char **));
 int parity           PROTO((int, char **));
+int cast             PROTO((int, char **));
 int circstats        PROTO((int, char **));
 int clear            PROTO((int, char **));
@@ -164 +165 @@
   {1, "buffers",      list_buffers,     "list the currently allocated buffers (images)"},
   {1, "center",       center,           "center image on coords"},
+  {1, "cast",         cast,             "cast input vector to specified type"},
   {1, "circstats",    circstats,        "circular statistics"},
   {1, "clear",        clear,            "erase plot"},

branches/eam_branches/ipp-20131211/Ohana/src/opihi/lib.shell/convert_to_RPN.c

@@ -30 +30 @@
     if (!strcmp (argv[i], "abs"))    { type = ST_UNARY; goto gotit; }
     if (!strcmp (argv[i], "int"))    { type = ST_UNARY; goto gotit; }
+    if (!strcmp (argv[i], "floor"))  { type = ST_UNARY; goto gotit; }
+    if (!strcmp (argv[i], "round"))  { type = ST_UNARY; goto gotit; }
+    if (!strcmp (argv[i], "ceil"))   { type = ST_UNARY; goto gotit; }
+    if (!strcmp (argv[i], "rint"))   { type = ST_UNARY; goto gotit; }
     if (!strcmp (argv[i], "exp"))    { type = ST_UNARY; goto gotit; }
     if (!strcmp (argv[i], "ten"))    { type = ST_UNARY; goto gotit; }

branches/eam_branches/ipp-20131211/Ohana/src/opihi/lib.shell/stack_math.c

@@ -1123 +1123 @@
   if (!strcmp (op, "abs"))    S_FUNC(fabs(M1), ST_SCALAR_INT);
   if (!strcmp (op, "int"))    S_FUNC((long long)(M1), ST_SCALAR_INT);
+  if (!strcmp (op, "floor"))  S_FUNC(floor (M1), ST_SCALAR_FLT);
+  if (!strcmp (op, "ceil"))   S_FUNC(ceil (M1), ST_SCALAR_FLT);
+  if (!strcmp (op, "rint"))   S_FUNC(nearbyint (M1), ST_SCALAR_FLT);
   if (!strcmp (op, "exp"))    S_FUNC(exp (M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ten"))    S_FUNC(pow (10.0,M1), ST_SCALAR_FLT);
@@ -1202 +1205 @@
   if (!strcmp (op, "abs"))    V_FUNC(fabs(*M1), ST_SCALAR_INT);
   if (!strcmp (op, "int"))    V_FUNC((long long)(*M1), ST_SCALAR_INT);
+  if (!strcmp (op, "floor"))  V_FUNC(floor (*M1), ST_SCALAR_FLT);
+  if (!strcmp (op, "ceil"))   V_FUNC(ceil (*M1), ST_SCALAR_FLT);
+  if (!strcmp (op, "rint"))   V_FUNC(nearbyint (*M1), ST_SCALAR_FLT);
   if (!strcmp (op, "exp"))    V_FUNC(exp(*M1), ST_SCALAR_FLT);
   if (!strcmp (op, "ten"))    V_FUNC(pow(10.0,*M1), ST_SCALAR_FLT);
@@ -1273 +1279 @@
   if (!strcmp (op, "abs"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = fabs(*M1);         }}
   if (!strcmp (op, "int"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = (opihi_flt)(long long)(*M1); }}
+
+  if (!strcmp (op, "floor")) { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = floor (*M1); }}
+  if (!strcmp (op, "ceil"))  { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = ceil (*M1); }}
+  if (!strcmp (op, "rint"))  { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = nearbyint (*M1); }}
+
   if (!strcmp (op, "exp"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = exp(*M1);          }}
   if (!strcmp (op, "ten"))   { for (i = 0; i < Nx*Ny; i++, out++, M1++) { *out = pow(10.0,*M1);     }}