Code

Converting cinvertor python#1370

Code

Merged

butlerpd merged 119 commits intoESS_GUISasView/sasview:ESS_GUIfrom converting_cinvertor_pythonSasView/sasview:converting_cinvertor_pythonCopy head branch name to clipboardApr 14, 2020

+1,196-1,885

Commits

Commits on Jul 1, 2019

• starting to test different methods of implementing cinvertor in python

  zattala

  committed
  325c31e

  Copy full SHA for 325c31e

• ortho_transformed and ortho_transformed_smeared functions tested

  Show description for 1e3efcc
  zattala

  committed
  1e3efcc

  Copy full SHA for 1e3efcc

• allow tests to run under ESS_GUI

  

  Paul Kienzle

  committed
  1671a77

  Copy full SHA for 1671a77

• Merge branch 'converting_cinvertor_python' of github.com:sasview/sasview into converting_cinvertor_python

  

  Paul Kienzle

  committed
  e33e92a

  Copy full SHA for e33e92a

• cleaned up comments

  zattala

  committed
  08078d1

  Copy full SHA for 08078d1

• Merge branch 'converting_cinvertor_python' of github.com:sasview/sasview into converting_cinvertor_python

  

  Paul Kienzle

  committed
  88fef49

  Copy full SHA for 88fef49

• cleaned up added class stub

  zattala

  committed
  61a3320

  Copy full SHA for 61a3320

• smear transform loop more efficient

  zattala

  committed
  a065a0b

  Copy full SHA for a065a0b

Commits on Jul 2, 2019

• added multiple functions and tested different ways of implementing iq()

  zattala

  committed
  23999b1

  Copy full SHA for 23999b1

• cleaning up iq

  zattala

  committed
  c8120db

  Copy full SHA for c8120db

• tested different versions iq_smeared() compiled with njit() for now

  zattala

  committed
  e1bdf5b

  Copy full SHA for e1bdf5b

Commits on Jul 3, 2019

• testing different versions of iq() and removing n_c

  zattala

  committed
  6f7c1da

  Copy full SHA for 6f7c1da

• testing different versions of iq() and removing n_c, added dprdr first implementation

  zattala

  committed
  e40051b

  Copy full SHA for e40051b

Commits on Jul 4, 2019

• added template pinvertor class, testing njit() with vec operations on iq_smeared function

  zattala

  committed
  56f1d4a

  Copy full SHA for 56f1d4a

• added all shell methods to pinvertor, added preliminary methods to py_invertor

  zattala

  committed
  9c3691a

  Copy full SHA for 9c3691a

• adding varaibles from invertor.c, linking py_invertor and pinvertor, testing other methods

  zattala

  committed
  65da947

  Copy full SHA for 65da947

Commits on Jul 5, 2019

• looking at converting Cinvertor.c class structure

  zattala

  committed
  fb144cf

  Copy full SHA for fb144cf

• check Pr with 500 bit arithmetic

  

  Paul Kienzle

  committed
  9f69625

  Copy full SHA for 9f69625

Commits on Jul 8, 2019

• added speed tests

  zattala

  committed
  1ab5522

  Copy full SHA for 1ab5522

• Merge branch 'converting_cinvertor_python' of https://github.com/SasView/sasview into converting_cinvertor_python

  zattala

  committed
  b29c1c3

  Copy full SHA for b29c1c3

• c vs python njit() code testing

  zattala

  committed
  8eb9d08

  Copy full SHA for 8eb9d08

• fixed whitespace and added initial implementations methods to pinvertor

  zattala

  committed
  55713dd

  Copy full SHA for 55713dd

Commits on Jul 9, 2019

• testing cache and c njit speed

  zattala

  committed
  acd1917

  Copy full SHA for acd1917

• pinvertor by reference getters/setters added

  zattala

  committed
  e656218

  Copy full SHA for e656218

• pinvertor err methods, generated_jit tests

  zattala

  committed
  9da2f36

  Copy full SHA for 9da2f36

Commits on Jul 10, 2019

• updated ortho_transformed, testing with c

  zattala

  committed
  7471186

  Copy full SHA for 7471186

• implemented more methods from cinvertor, tested npeaks

  zattala

  committed
  00675f5

  Copy full SHA for 00675f5

Commits on Jul 11, 2019

• implemented multiple more methods in Pinvertor from Cinvertor, minor fixes to py_invertor

  zattala

  committed
  07bd83d

  Copy full SHA for 07bd83d

• implemented more cinvertor methods more fixes py_invertor

  zattala

  committed
  4912846

  Copy full SHA for 4912846

• testing two methods of get_matrix

  zattala

  committed
  fae29ff

  Copy full SHA for fae29ff

Commits on Jul 12, 2019

• finished initial version of Pinvertor

  zattala

  committed
  993b09f

  Copy full SHA for 993b09f

• testing integration with invertor.py

  zattala

  committed
  e13fa77

  Copy full SHA for e13fa77

• fixes to pinvertor

  zattala

  committed
  2b044e4

  Copy full SHA for 2b044e4

• fixing pinvertor for unit tests

  zattala

  committed
  385531d

  Copy full SHA for 385531d

• further error fixing

  zattala

  committed
  3a7dfb8

  Copy full SHA for 3a7dfb8

Commits on Jul 15, 2019

• modified error handling pinvertor

  zattala

  committed
  f293257

  Copy full SHA for f293257

Commits on Jul 16, 2019

• more refractoring of Pinvertor and changes to py_invertor

  zattala

  committed
  c452761

  Copy full SHA for c452761

• accessor method change

  zattala

  committed
  116532a

  Copy full SHA for 116532a

Commits on Jul 17, 2019

• pinvertor bug fixes

  zattala

  committed
  3a875ca

  Copy full SHA for 3a875ca

• Completed Pinvertor Initial Version

  Show description for 096e405
  zattala

  committed
  096e405

  Copy full SHA for 096e405

• __init__ set_dmax update

  zattala

  committed
  3166cd6

  Copy full SHA for 3166cd6

• added docstrings to all methods in pinvertor, also cleaned up generally

  zattala

  committed
  dcaab9f

  Copy full SHA for dcaab9f

Commits on Jul 18, 2019

• added demonstrations and c equivalent testing

  zattala

  committed
  5591034

  Copy full SHA for 5591034

• cleaned up comments py_invertor

  zattala

  committed
  66e11d9

  Copy full SHA for 66e11d9

Commits on Jul 22, 2019

• added invertor.c tests to this branch

  zattala

  committed
  feb2040

  Copy full SHA for feb2040

• updated accuracy on tests

  zattala

  committed
  ca1cc32

  Copy full SHA for ca1cc32

• updated scope of tests

  zattala

  committed
  30254e4

  Copy full SHA for 30254e4

• cleaning up tests

  zattala

  committed
  1b84b4e

  Copy full SHA for 1b84b4e

Commits on Jul 23, 2019

• cleaned up demos

  zattala

  committed
  cc9daad

  Copy full SHA for cc9daad

• formatting

  zattala

  committed
  cb8351e

  Copy full SHA for cb8351e

Commits on Jul 24, 2019

• refractored to have conditional numba decorators, still passes tests

  zattala

  committed
  e22cbfc

  Copy full SHA for e22cbfc

Commits on Jul 25, 2019

• stricter typing in Pinvertor, get_matrix done with njit()

  Show description for 1ab3552
  zattala

  committed
  1ab3552

  Copy full SHA for 1ab3552

• added pre computing in get_matrix and alternative method to compute inv_cov

  zattala

  committed
  163ddbd

  Copy full SHA for 163ddbd

Commits on Jul 30, 2019

• variable access updating

  zattala

  committed
  42d7caf

  Copy full SHA for 42d7caf

• property tags

  zattala

  committed
  f61f0e3

  Copy full SHA for f61f0e3

• starting to remove __setattr__ and __getattr__

  zattala

  committed
  685aeb5

  Copy full SHA for 685aeb5

• starting to remove __setattr__ and __getattr__

  zattala

  committed
  c4d58ef

  Copy full SHA for c4d58ef

• Revert "starting to remove __setattr__ and __getattr__"

  Show description for 25193c0
  zattala

  committed
  25193c0

  Copy full SHA for 25193c0

• Revert "starting to remove __setattr__ and __getattr__"

  Show description for 8e1632d
  zattala

  committed
  8e1632d

  Copy full SHA for 8e1632d

• Revert "property tags"

  Show description for dcbdfe9
  zattala

  committed
  dcbdfe9

  Copy full SHA for dcbdfe9

• testing type safety in numba

  zattala

  committed
  61d0e8a

  Copy full SHA for 61d0e8a

Commits on Jul 31, 2019

• further testing of lower level accuracy and removing exe file

  zattala

  committed
  903edeb

  Copy full SHA for 903edeb

• added tests for vector of r pr_err tests and more type checks

  zattala

  committed
  34f8bac

  Copy full SHA for 34f8bac

Commits on Aug 1, 2019

• testing for estimate_alpha problem

  zattala

  committed
  cb4dec8

  Copy full SHA for cb4dec8

Commits on Aug 2, 2019

• fixed estimate_alpha() method

  zattala

  committed
  16f8056

  Copy full SHA for 16f8056

• Pinvertor now returns identical results to Cinvertor

  Show description for 9608863
  zattala

  committed
  9608863

  Copy full SHA for 9608863

• refractoring module names and relative imports

  zattala

  committed
  6c19548

  Copy full SHA for 6c19548

• vectorizing pinvertor methods

  Show description for 9d8c150
  zattala

  committed
  9d8c150

  Copy full SHA for 9d8c150

• removed output log file

  zattala

  committed
  a4232ee

  Copy full SHA for a4232ee

Commits on Aug 5, 2019

• vectorised completely get_matrix, speed of invertor now (nearly) identical to C

  zattala

  committed
  d42ca1a

  Copy full SHA for d42ca1a

• fixed q_min accessors and accept_q returning scalar

  zattala

  committed
  203919d

  Copy full SHA for 203919d

• cleaned up typing and in general p_invertor

  Show description for c1c54ae
  zattala

  committed
  c1c54ae

  Copy full SHA for c1c54ae

• basefunc_ft now accepts vector as well as scalar inputs

  zattala

  committed
  b0a55cb

  Copy full SHA for b0a55cb

• changed iq to now accept q vector or scalar, also residuals now operates on vectorised q

  zattala

  committed
  0308b49

  Copy full SHA for 0308b49

• changed py_invertor.py to calc.py for readability

  zattala

  committed
  2a1f719

  Copy full SHA for 2a1f719

Commits on Aug 6, 2019

• vectorised iq in qtgui and fixed important bug in compute_matrix

  zattala

  committed
  8320d7b

  Copy full SHA for 8320d7b

• removed debug messages

  zattala

  committed
  494955c

  Copy full SHA for 494955c

• cleaned up calc and p_invertor

  Show description for bac73ec
  zattala

  committed
  bac73ec

  Copy full SHA for bac73ec

• removed conditional_decorator() replaced with cleaner conditional numba

  zattala

  committed
  d91c75d

  Copy full SHA for d91c75d

• minor cleanup

  zattala

  committed
  64ab66f

  Copy full SHA for 64ab66f

Commits on Aug 7, 2019

• type safety of p_invertor

  Show description for e094c18
  zattala

  committed
  e094c18

  Copy full SHA for e094c18

Commits on Aug 8, 2019

• fixed final bug, also now fast

  Show description for 52a0f0d
  zattala

  committed
  52a0f0d

  Copy full SHA for 52a0f0d

• removed temporary files

  zattala

  committed
  1f93a84

  Copy full SHA for 1f93a84

• more cleanup, changed way arrays read in getters/setters

  zattala

  committed
  13a0112

  Copy full SHA for 13a0112

• err calculated by scalar for more informative error messages

  zattala

  committed
  adb6bbe

  Copy full SHA for adb6bbe

• more loops into vector operations

  zattala

  committed
  e7621ec

  Copy full SHA for e7621ec

• minor change to get_matrix

  zattala

  committed
  25fac40

  Copy full SHA for 25fac40

Commits on Aug 9, 2019

• iq_smeared now calculated as a vector in InversionLogic

  zattala

  committed
  0298d43

  Copy full SHA for 0298d43

• updated docstrings

  zattala

  committed
  f76dedb

  Copy full SHA for f76dedb

• documentation on calc.py removed truncated pi updated unit test to reflect.

  zattala

  committed
  40f8aa6

  Copy full SHA for 40f8aa6

• removed tests on invertor.c

  zattala

  committed
  7b56c90

  Copy full SHA for 7b56c90

• removed time.h import

  zattala

  committed
  b8f7a21

  Copy full SHA for b8f7a21

• removed C code for inversion

  zattala

  committed
  ab57fa9

  Copy full SHA for ab57fa9

Commits on Aug 12, 2019

• vectorised more methods ortho now vectorised over n

  zattala

  committed
  adb572e

  Copy full SHA for adb572e

• pr and pr_err now vectorised over r inversionlogic also runs over vectorised r

  zattala

  committed
  7346688

  Copy full SHA for 7346688

• pos_errs and rg entirely operate with vector operations

  zattala

  committed
  438450c

  Copy full SHA for 438450c

• dprdr and reg_term vectorised, general formatting of code

  zattala

  committed
  1dee56f

  Copy full SHA for 1dee56f

• removal unnecessary code, return by value instead of by reference for some pinvertor methods

  Show description for f6b90fe
  zattala

  committed
  f6b90fe

  Copy full SHA for f6b90fe

Commits on Aug 13, 2019

• minor cleanup

  zattala

  committed
  cba7b2f

  Copy full SHA for cba7b2f

• total and p_max removed

  zattala

  committed
  36b21de

  Copy full SHA for 36b21de

• setup.py updated to remove reference to c_extensions.

  Show description for e9bc1b9
  zattala

  committed
  e9bc1b9

  Copy full SHA for e9bc1b9

Commits on Aug 14, 2019

• removed unncessary initializations, added unused method warning.

  zattala

  committed
  4f9eacd

  Copy full SHA for 4f9eacd

• Merge branch 'ESS_GUI' into converting_cinvertor_python

  zattala

  committed
  8e19fa6

  Copy full SHA for 8e19fa6

• removed test import error on numba import

  zattala

  committed
  906c10b

  Copy full SHA for 906c10b

Commits on Aug 15, 2019

• removed reference to sas.sascalc.pr.core, not in current ESS_GUI

  zattala

  committed
  777e6af

  Copy full SHA for 777e6af

Commits on Aug 16, 2019

• Added numba to the conda environment file and pyinstaller script

  rozyczko

  committed
  da236d7

  Copy full SHA for da236d7

Commits on Aug 19, 2019

• Enforce numpy version, since it is getting updated by one of dependent

  Show description for a2667ac
  rozyczko

  committed
  a2667ac

  Copy full SHA for a2667ac

Commits on Aug 20, 2019

• important bug fix to iq_smeared method

  zattala

  committed
  6a77e94

  Copy full SHA for 6a77e94

Commits on Aug 28, 2019

• ortho_transformed now handles q = 0

  zattala

  committed
  7191491

  Copy full SHA for 7191491

Commits on Sep 4, 2019

• Merge branch 'ESS_GUI' into converting_cinvertor_python

  

  Paul Kienzle

  committed
  3ff745e

  Copy full SHA for 3ff745e

• simplify Pr handling of NaN values

  

  Paul Kienzle

  committed
  c6ecfb3

  Copy full SHA for c6ecfb3

Commits on Sep 6, 2019

• fix Pr invertor for python 2.7

  pkienzle

  committed
  89fe6bf

  Copy full SHA for 89fe6bf

Commits on Sep 17, 2019

• Merge branch 'ESS_GUI' into converting_cinvertor_python

  pkienzle

  authored
  3a381e6

  Copy full SHA for 3a381e6

Commits on Feb 19, 2020

• Merge branch 'ESS_GUI' into converting_cinvertor_python

  pkienzle

  authored
  3e611e7

  Copy full SHA for 3e611e7

Commits on Feb 20, 2020

• Merge branch 'ESS_GUI' into converting_cinvertor_python

  

  Paul Kienzle

  committed
  0bef6d4

  Copy full SHA for 0bef6d4

• simplify build since no longer any compiled code in the package

  

  Paul Kienzle

  committed
  f6f3e6c

  Copy full SHA for f6f3e6c

• make sure failure text shows up in the build log

  

  Paul Kienzle

  committed
  3ee1eb7

  Copy full SHA for 3ee1eb7

• reenable all unit tests

  

  Paul Kienzle

  committed
  f31fce5

  Copy full SHA for f31fce5

Commits on Mar 31, 2020

• inverter: use approximate floating point test

  

  Paul Kienzle

  committed
  726049c

  Copy full SHA for 726049c