[Scipy-svn] r2979 - in trunk/Lib/sandbox/timeseries: include src
scipy-svn at scipy.org
scipy-svn at scipy.org
Wed May 9 15:37:28 EDT 2007
Author: mattknox_ca
Date: 2007-05-09 14:37:20 -0500 (Wed, 09 May 2007)
New Revision: 2979
Modified:
trunk/Lib/sandbox/timeseries/include/c_tdates.h
trunk/Lib/sandbox/timeseries/src/c_tdates.c
trunk/Lib/sandbox/timeseries/src/c_tseries.c
trunk/Lib/sandbox/timeseries/src/cseries.c
Log:
fixed some compiler warnings
Modified: trunk/Lib/sandbox/timeseries/include/c_tdates.h
===================================================================
--- trunk/Lib/sandbox/timeseries/include/c_tdates.h 2007-05-09 18:38:52 UTC (rev 2978)
+++ trunk/Lib/sandbox/timeseries/include/c_tdates.h 2007-05-09 19:37:20 UTC (rev 2979)
@@ -109,16 +109,10 @@
PyObject *DateArray_asfreq(PyObject *, PyObject *);
PyObject *DateArray_getDateInfo(PyObject *, PyObject *);
-char c_tdates_thisday_doc[];
-PyObject *c_tdates_thisday(PyObject *, PyObject *);
-char c_tdates_check_freq_doc[];
+PyObject *c_tdates_thisday(PyObject *, PyObject *);
PyObject *c_tdates_check_freq(PyObject *, PyObject *);
-
-char c_tdates_check_freq_str_doc[];
PyObject *c_tdates_check_freq_str(PyObject *, PyObject *);
-
-char c_tdates_get_freq_group_doc[];
PyObject *c_tdates_get_freq_group(PyObject *, PyObject *);
PyObject *set_callback_DateFromString(PyObject *, PyObject *);
Modified: trunk/Lib/sandbox/timeseries/src/c_tdates.c
===================================================================
--- trunk/Lib/sandbox/timeseries/src/c_tdates.c 2007-05-09 18:38:52 UTC (rev 2978)
+++ trunk/Lib/sandbox/timeseries/src/c_tdates.c 2007-05-09 19:37:20 UTC (rev 2979)
@@ -2279,8 +2279,6 @@
///////////////////////////////////////////////////////////////////////
-char c_tdates_check_freq_doc[] =
-"translate user specified frequency into frequency constant";
PyObject *
c_tdates_check_freq(PyObject *self, PyObject *args) {
@@ -2293,8 +2291,6 @@
return PyInt_FromLong(freq_val);
}
-char c_tdates_check_freq_str_doc[] =
-"translate user specified frequency into standard string representation";
PyObject *
c_tdates_check_freq_str(PyObject *self, PyObject *args) {
@@ -2312,8 +2308,6 @@
return result;
}
-char c_tdates_get_freq_group_doc[] =
-"translate user specified frequency into frequency group constant";
PyObject *
c_tdates_get_freq_group(PyObject *self, PyObject *args) {
@@ -2326,12 +2320,6 @@
return PyInt_FromLong(get_freq_group(freq_val));
}
-char c_tdates_thisday_doc[] =
-"Returns today's date, at the given frequency\n\n"
-":Parameters:\n"
-" - freq : string/int\n"
-" Frequency to convert the Date to. Accepts any valid frequency\n"
-" specification (string or integer)\n";
PyObject *
c_tdates_thisday(PyObject *self, PyObject *args) {
Modified: trunk/Lib/sandbox/timeseries/src/c_tseries.c
===================================================================
--- trunk/Lib/sandbox/timeseries/src/c_tseries.c 2007-05-09 18:38:52 UTC (rev 2978)
+++ trunk/Lib/sandbox/timeseries/src/c_tseries.c 2007-05-09 19:37:20 UTC (rev 2979)
@@ -118,7 +118,6 @@
long newStart, newStartTemp;
long newEnd, newEndTemp;
long newLen, newHeight;
- int i;
long currIndex, prevIndex;
long nd;
npy_intp *dim, *newIdx;
@@ -128,6 +127,7 @@
int fromFreq, toFreq;
char relation;
asfreq_info af_info;
+ Py_ssize_t i;
PyObject *val, *valMask;
@@ -359,7 +359,8 @@
{
PyArrayObject *orig_mask_tmp;
- int i, valid_points=0, is_masked;
+ int valid_points=0, is_masked;
+ Py_ssize_t i;
orig_mask_tmp = (PyArrayObject*)orig_mask;
@@ -401,7 +402,7 @@
calc_mov_sum(PyArrayObject *orig_ndarray, int span, int rtype)
{
PyArrayObject *result_ndarray=NULL;
- int i;
+ Py_ssize_t i;
result_ndarray = (PyArrayObject*)PyArray_ZEROS(
orig_ndarray->nd,
@@ -418,7 +419,7 @@
if (i == 0) {
mov_sum_val = val;
} else {
- int prev_idx = i-1;
+ Py_ssize_t prev_idx = i-1;
PyObject *mov_sum_prevval;
mov_sum_prevval= PyArray_GETITEM(result_ndarray,
PyArray_GetPtr(result_ndarray, &prev_idx));
@@ -428,7 +429,7 @@
if (i >= span) {
PyObject *temp_val, *rem_val;
- int rem_idx = i-span;
+ Py_ssize_t rem_idx = i-span;
temp_val = mov_sum_val;
rem_val = PyArray_GETITEM(orig_ndarray,
PyArray_GetPtr(orig_ndarray, &rem_idx));
@@ -552,8 +553,9 @@
PyObject **result_array, **ref_array, **even_array=NULL;
PyObject *new_val, *old_val;
PyObject *temp_add, *one_half;
- int a, i, k, R, arr_size, z;
+ int a, k, R, arr_size, z;
int *r;
+ Py_ssize_t i;
arr_size = orig_ndarray->dimensions[0];
@@ -830,6 +832,7 @@
Py_DECREF(result_ndarray);
Py_DECREF(result_mask);
return result_dict;
+
}
void import_c_tseries(PyObject *m) { import_array(); }
Modified: trunk/Lib/sandbox/timeseries/src/cseries.c
===================================================================
--- trunk/Lib/sandbox/timeseries/src/cseries.c 2007-05-09 18:38:52 UTC (rev 2978)
+++ trunk/Lib/sandbox/timeseries/src/cseries.c 2007-05-09 19:37:20 UTC (rev 2979)
@@ -2,7 +2,6 @@
#include "c_tdates.h"
#include "c_tseries.h"
-
static PyMethodDef cseries_methods[] = {
{"MA_mov_sum", (PyCFunction)MaskedArray_mov_sum,
@@ -22,15 +21,28 @@
{"DA_getDateInfo", (PyCFunction)DateArray_getDateInfo,
METH_VARARGS, ""},
+
{"thisday", (PyCFunction)c_tdates_thisday,
- METH_VARARGS, c_tdates_thisday_doc},
+ METH_VARARGS,
+ "Returns today's date, at the given frequency\n\n"
+ ":Parameters:\n"
+ " - freq : string/int\n"
+ " Frequency to convert the Date to. Accepts any valid frequency\n"
+ " specification (string or integer)\n"},
+
{"check_freq", (PyCFunction)c_tdates_check_freq,
- METH_VARARGS, c_tdates_check_freq_doc},
+ METH_VARARGS,
+ "translate user specified frequency into frequency constant"},
+
{"check_freq_str", (PyCFunction)c_tdates_check_freq_str,
- METH_VARARGS, c_tdates_check_freq_str_doc},
+ METH_VARARGS,
+ "translate user specified frequency into standard string representation"},
+
{"get_freq_group", (PyCFunction)c_tdates_get_freq_group,
- METH_VARARGS, c_tdates_get_freq_group_doc},
+ METH_VARARGS,
+ "translate user specified frequency into frequency group constant"},
+
{"set_callback_DateFromString", (PyCFunction)set_callback_DateFromString,
METH_VARARGS, ""},
{"set_callback_DateTimeFromString", (PyCFunction)set_callback_DateTimeFromString,
@@ -51,4 +63,5 @@
import_c_lib(m);
import_c_tdates(m);
import_c_tseries(m);
+
}
More information about the Scipy-svn
mailing list