dennissheberla
9109285b58
Improved compatibility with new .mpr files
...
Temporary removed mpr file LOG MODULE support
2017-04-22 13:50:53 +02:00
dennissheberla
b96fedac05
Improved compatibility with .mpt files
...
Fixes bugs in reading new fields and non-ascii chars in .mpt files
2017-04-22 13:46:30 +02:00
Chris Kerr
3423fe7dc9
Merge pull request #11 from chatcannon/tox
...
Add testing with tox
2017-04-22 13:31:04 +02:00
791cb8987e
In get_testdata.sh, don't download files that have already been downloaded
2017-04-22 13:27:55 +02:00
Chris Kerr
f58b3f6ffd
Merge pull request #10 from chatcannon/fix-numpy-1.12
...
Fix numpy 1.12 TypeError
2017-04-22 13:18:09 +02:00
760bf30b1a
Add caching to the .travis.yml file
2017-04-22 13:17:06 +02:00
49bfcb75eb
Proper syntax for two install commands
2017-04-22 13:08:06 +02:00
3d21eade48
Tox testing on Travis with tox-travis
2017-04-22 13:05:19 +02:00
169f2a6b88
Added tox.ini for testing with tox
...
see #5
2017-04-22 13:02:53 +02:00
dfd0d14eae
Merge branch 'master' into fix-numpy-1.12
2017-04-22 12:56:09 +02:00
Chris Kerr
f1b618f121
Merge pull request #9 from chatcannon/setup-travis-ci
...
Setup travis ci
2017-04-22 12:55:39 +02:00
5df258f125
Don't test on Python 2.6 as it does not have OrderedDict
...
Fixes #6
2017-04-22 12:54:07 +02:00
fa264ff08e
Download the test data when running the tests
2017-04-22 12:51:01 +02:00
a7d93035e8
Use nosetests in .travis.yml
2017-04-22 12:48:21 +02:00
e38dc0c92a
Created requirements.txt
2017-04-22 12:47:05 +02:00
b8c8f23f63
Default Python .travis.yml file from the Travis-CI docs
2017-04-22 12:38:23 +02:00
22878be0c5
Explicitly coerce size-1 array to scalar
...
Fixes #4
2017-04-22 12:34:02 +02:00
70e60b3565
Ignore .cache directory
2017-04-22 12:29:08 +02:00
Chris Kerr
907f209476
Requirements should be a list
2014-11-09 12:48:20 +00:00
Chris Kerr
260fa7f7c1
Install the res2sqlite.py script
2014-11-08 14:42:52 +00:00
Chris Kerr
ae2b263989
FigShare changes all '-' to '_' in filenames
2014-11-08 11:26:43 +00:00
Chris Kerr
6973fc4e5c
Make it work with Python 2 again
2014-11-07 16:30:27 +00:00
Chris Kerr
7da8b8b5e6
Changed to a standard setuptools package layout
2014-11-07 15:42:53 +00:00
Chris Kerr
b7009e8630
Fixed some pyflakes warnings by removing unused imports
2014-11-06 09:58:27 +00:00
Chris Kerr
ef6e7335e9
Added the test data files sent by Matthias Richter (see #1 )
...
Had to make a few changes to ensure that they open correctly
2014-11-06 09:54:38 +00:00
Chris Kerr
045f15c855
Script to download the test data from figshare
2014-11-06 08:25:44 +00:00
Chris Kerr
9b2a902061
Added some new dtypes suggested by @Yohko - re #1
2014-07-09 19:45:05 +01:00
Chris Kerr
cfffeee2e2
Made the individual components of the "flags" and "flags2" columns accessible
...
New function MPRfile.get_flag(flagname)
2014-05-01 23:02:23 +01:00
Chris Kerr
c302ec9117
Tweaks to make things work in both python 3 and python 2
2013-12-12 15:24:20 +00:00
Chris Kerr
5c747fe404
Tweaks to make things work on Python 2
2013-12-12 13:46:03 +00:00
Chris Kerr
34440068a7
Added support for parsing out the timestamp
...
The timestamp is in the LOG module, at an offset of either 465 or
469. There is no obvious marker for which files have it at 465 and
which at 469.
2013-12-11 22:21:50 +00:00
Chris Kerr
de84f9dd40
Added column IDs from step voltammetry
2013-12-11 13:14:19 +00:00
Chris Kerr
00e6670b4a
Added I/mA column type = 8
...
Also there seems to be a duplicate of colID=23 is the same as 7 (dq/mAh)
2013-12-11 12:50:45 +00:00
Chris Kerr
ce554aab2c
Column ID 19 is "control/V"
...
Added some new test data to support this
2013-12-11 11:58:41 +00:00
Chris Kerr
3483195228
"control/V" and "control/V/mA" are different
...
No longer forcing them both to "control/V/mA"
2013-12-11 11:54:07 +00:00
Chris Kerr
6a63196a67
Created function to process the list of column types and return a numpy dtype
2013-12-10 09:44:36 +00:00
Chris Kerr
509b75a81f
Deal with yet another format - with more flags data (I think)
2013-12-08 14:07:32 +00:00
Chris Kerr
fa14ba94f8
Check for module version other than 0 or 2
2013-12-08 13:41:44 +00:00
Chris Kerr
2724e2a833
Changed data reading to handle the newer file format
2013-12-08 13:37:59 +00:00
Chris Kerr
549b9ed61b
The size part of the VMP module header seems only to be 32 bit, with
...
32 bits remaining for a ?version number?
2013-12-08 13:11:03 +00:00
Chris Kerr
0ce9b6fb16
There seem to be several different MPR formats - adding a test for a different one
2013-12-08 13:09:35 +00:00
Chris Kerr
7d0f1e0172
Added code to parse the date string in the module headers
2013-12-04 23:20:26 +00:00
Chris Kerr
3aa3716788
Improved MPRfile docstring
2013-12-03 22:11:58 +00:00
Chris Kerr
ee892b12c7
Basic README
2013-12-02 07:53:22 +00:00
Chris Kerr
e83d1936a5
Ported res2sqlite.py to Python 3 and changed argument parsing to use argparse
2013-12-02 07:49:44 +00:00
Chris Kerr
d7c274ecd6
Imported res2sqlite.py script from previous work
2013-12-02 07:26:15 +00:00
Chris Kerr
1f9c9653c5
Added class to read in .mpr files
...
The class currently just reads the main data section and does not
process any of the headers or log information.
2013-11-30 20:08:08 +00:00
Chris Kerr
d909305b74
Added a class to read in .mpt files as numpy record arrays
...
Realised that comparing numpy arrays read in from the binary .mpr
files to a csv.DictReader would be more work than just writing a
new function to read in a record array.
2013-11-30 11:35:44 +00:00
Chris Kerr
9e66d589a4
Simple function for reading in .mpt text files
...
This will be helpful for checking the data read in by the .mpr
file reader
2013-11-29 22:19:01 +00:00
Chris Kerr
98dc2800d7
Ignore test data for now
...
Will come up with a solution for distributing data files for the
tests if and when demand arises.
2013-11-29 21:16:12 +00:00
