Code

48 fractional binning#101

Code

Draft

lucas-wilkins wants to merge 147 commits intomasterSasView/sasdata:masterfrom 48-fractional-binningSasView/sasdata:48-fractional-binningCopy head branch name to clipboard

+18,699-1

Commits

Commits on Sep 20, 2023

• Work towards fraction binning

  lucas-wilkins

  committed
  cace32f

  Copy full SHA for cace32f

Commits on Sep 22, 2023

• Mesh merging and some refactoring

  lucas-wilkins

  committed
  459341d

  Copy full SHA for 459341d

Commits on Sep 24, 2023

• Triangulated mesh

  lucas-wilkins

  committed
  1290f31

  Copy full SHA for 1290f31

Commits on Sep 25, 2023

• Mesh merging works

  lucas-wilkins

  committed
  5e809ea

  Copy full SHA for 5e809ea

Commits on Sep 28, 2023

• Implementation of Rebinner base class

  lucas-wilkins

  committed
  f7fc0a5

  Copy full SHA for f7fc0a5

• Work towards demo

  lucas-wilkins

  committed
  b8f0694

  Copy full SHA for b8f0694

• Voronoi mesh edges and ordering

  lucas-wilkins

  committed
  583c8b4

  Copy full SHA for 583c8b4

• It works, needs benchmarking

  lucas-wilkins

  committed
  bf653ad

  Copy full SHA for bf653ad

Commits on Sep 29, 2023

• Much faster assignment/merge method

  lucas-wilkins

  committed
  8cc300a

  Copy full SHA for 8cc300a

Commits on Oct 5, 2023

• Significantly faster edge crossing algorithm

  lucas-wilkins

  committed
  1f83877

  Copy full SHA for 1f83877

• Demo

  lucas-wilkins

  committed
  555f76c

  Copy full SHA for 555f76c

• Requirements

  lucas-wilkins

  committed
  55a1138

  Copy full SHA for 55a1138

• Merge branch 'master' into 48-fractional-binning

  lucas-wilkins

  authored
  c7c04a5

  Copy full SHA for c7c04a5

Commits on Dec 7, 2023

• Merge branch 'master' into 48-fractional-binning

  lucas-wilkins

  authored
  628e56c

  Copy full SHA for 628e56c

Commits on Jul 30, 2024

• Added draft dataset types

  lucas-wilkins

  committed
  2db12a6

  Copy full SHA for 2db12a6

Commits on Jul 31, 2024

• Data sketch

  lucas-wilkins

  committed
  c669b6d

  Copy full SHA for c669b6d

• Merge pull request #77 from SasView/refactor_24-73-file-type-descriptions

  Show description for 41dc519
  lucas-wilkins

  authored
  41dc519

  Copy full SHA for 41dc519

Commits on Aug 5, 2024

• Some units

  lucas-wilkins

  committed
  9976f4e

  Copy full SHA for 9976f4e

Commits on Aug 6, 2024

• Merge pull request #78 from SasView/76-basic-outline-of-new-data-types

  Show description for fc433c3
  lucas-wilkins

  authored
  fc433c3

  Copy full SHA for fc433c3

• Work towards outline

  lucas-wilkins

  committed
  677008a

  Copy full SHA for 677008a

• Units now available and grouped

  lucas-wilkins

  committed
  41d63eb

  Copy full SHA for 41d63eb

• Merge branch 'refactor_24' into 76-basic-outline-of-new-data-types

  lucas-wilkins

  authored
  ffb0110

  Copy full SHA for ffb0110

• Merge pull request #80 from SasView/76-basic-outline-of-new-data-types

  Show description for 8ccf70f
  lucas-wilkins

  authored
  8ccf70f

  Copy full SHA for 8ccf70f

• More units

  lucas-wilkins

  committed
  e2b5da4

  Copy full SHA for e2b5da4

• one d in shadow

  lucas-wilkins

  committed
  3aaec14

  Copy full SHA for 3aaec14

• Fixed density units

  lucas-wilkins

  committed
  7c08e01

  Copy full SHA for 7c08e01

• Use alias list to remove duplicates

  lucas-wilkins

  committed
  2e15da5

  Copy full SHA for 2e15da5

• More units, towards formatting

  lucas-wilkins

  committed
  a890f65

  Copy full SHA for a890f65

Commits on Aug 7, 2024

• Units and accessors draft ready to begin tests on

  lucas-wilkins

  committed
  35b7921

  Copy full SHA for 35b7921

• Some tests

  lucas-wilkins

  committed
  ef7d2b9

  Copy full SHA for ef7d2b9

• SI unit module

  lucas-wilkins

  committed
  b8f16c2

  Copy full SHA for b8f16c2

• si unit list

  lucas-wilkins

  committed
  bc8d677

  Copy full SHA for bc8d677

• More tests, added names

  lucas-wilkins

  committed
  cf11e27

  Copy full SHA for cf11e27

• More units

  lucas-wilkins

  committed
  8050c92

  Copy full SHA for 8050c92

• Notes

  lucas-wilkins

  committed
  0e492a0

  Copy full SHA for 0e492a0

Commits on Aug 8, 2024

• Notes

  lucas-wilkins

  committed
  e990f71

  Copy full SHA for e990f71

• start of metadata structure

  lucas-wilkins

  committed
  f9bb4a3

  Copy full SHA for f9bb4a3

Commits on Aug 13, 2024

• Metadata work, and unit groups

  lucas-wilkins

  committed
  8b4372d

  Copy full SHA for 8b4372d

• More metadata stuff

  lucas-wilkins

  committed
  4372c2f

  Copy full SHA for 4372c2f

• Named units in unit groups

  lucas-wilkins

  committed
  a6aed62

  Copy full SHA for a6aed62

Commits on Aug 14, 2024

• More metadata, added absolute temperature stuff

  lucas-wilkins

  committed
  6ab996e

  Copy full SHA for 6ab996e

• Metadata objects complete for now

  lucas-wilkins

  committed
  9c6302a

  Copy full SHA for 9c6302a

• Percent test and fix

  lucas-wilkins

  committed
  b3f4686

  Copy full SHA for b3f4686

Commits on Aug 21, 2024

• Work towards new data object

  lucas-wilkins

  committed
  851253a

  Copy full SHA for 851253a

Commits on Aug 28, 2024

• Basic reading

  lucas-wilkins

  committed
  2f11e68

  Copy full SHA for 2f11e68

Commits on Aug 29, 2024

• Work towards structuring inputs with uncertainties

  lucas-wilkins

  committed
  c5838a1

  Copy full SHA for c5838a1

Commits on Sep 9, 2024

• Work on uncertainty propagation

  lucas-wilkins

  committed
  18ef91a

  Copy full SHA for 18ef91a

Commits on Sep 11, 2024

• Added some code to enable test driven development.

  jamescrake-merani

  committed
  b206b03

  Copy full SHA for b206b03

• Some minor changes to stop my editor from crying.

  Show description for 194fd5c
  jamescrake-merani

  committed
  194fd5c

  Copy full SHA for 194fd5c

• Pass in the dimensions so this code is correct.

  jamescrake-merani

  committed
  4463584

  Copy full SHA for 4463584

• Wrote some tests ahead.

  Show description for ffea2d6
  jamescrake-merani

  committed
  ffea2d6

  Copy full SHA for ffea2d6

• Parse using a slant as well.

  jamescrake-merani

  committed
  6a72ac6

  Copy full SHA for 6a72ac6

• Found a regex for splitting up the string.

  jamescrake-merani

  committed
  5788a82

  Copy full SHA for 5788a82

• Implemented the parse_single_unit function.

  jamescrake-merani

  committed
  ad251e5

  Copy full SHA for ad251e5

• Use two functions for parsing.

  jamescrake-merani

  committed
  92b076a

  Copy full SHA for 92b076a

Commits on Sep 12, 2024

• Use list comprehension to get potential symbols.

  jamescrake-merani

  committed
  7159ca2

  Copy full SHA for 7159ca2

• parse unit strs function.

  jamescrake-merani

  committed
  2e38eb5

  Copy full SHA for 2e38eb5

• Created a function to pass in a stack of units.

  jamescrake-merani

  committed
  c19f655

  Copy full SHA for c19f655

• Multiply dimensions function.

  jamescrake-merani

  committed
  0a9cac2

  Copy full SHA for 0a9cac2

• Use the new multiply function.

  jamescrake-merani

  committed
  09d0b8d

  Copy full SHA for 09d0b8d

• Nvm I'm blind; there already was a multiply method.

  jamescrake-merani

  committed
  355b8d5

  Copy full SHA for 355b8d5

• Parse in a whole unit.

  jamescrake-merani

  committed
  6bf37fa

  Copy full SHA for 6bf37fa

• I still need this multply for parse_unit_stack.

  Show description for 938db13
  jamescrake-merani

  committed
  938db13

  Copy full SHA for 938db13

Commits on Sep 16, 2024

• System for combining units.

  Show description for 9d20353
  jamescrake-merani

  committed
  9d20353

  Copy full SHA for 9d20353

• Removed not implemented comment.

  jamescrake-merani

  committed
  69e9310

  Copy full SHA for 69e9310

• Parse in a named unit.

  jamescrake-merani

  committed
  5ddd1bd

  Copy full SHA for 5ddd1bd

• Avoid mutating state.

  jamescrake-merani

  committed
  eae52d0

  Copy full SHA for eae52d0

Commits on Sep 17, 2024

• Replace the unit on the stack.

  jamescrake-merani

  committed
  7d3840b

  Copy full SHA for 7d3840b

• Fixed the logic around combining units.

  jamescrake-merani

  committed
  e8a2d3b

  Copy full SHA for e8a2d3b

• Parse_name_unit can take in an already parsed unit.

  jamescrake-merani

  committed
  99f4f81

  Copy full SHA for 99f4f81

• Added a todo comment.

  jamescrake-merani

  committed
  bd3dfe8

  Copy full SHA for bd3dfe8

• Take a unit from the command line.

  jamescrake-merani

  committed
  8a9d701

  Copy full SHA for 8a9d701

• Added whitespace on input.

  jamescrake-merani

  committed
  1c773e0

  Copy full SHA for 1c773e0

• Fixed typo.

  jamescrake-merani

  committed
  a7bbba5

  Copy full SHA for a7bbba5

• Only multiply scale by 1, or -1.

  jamescrake-merani

  committed
  05c3c02

  Copy full SHA for 05c3c02

• Look for slashes in the string.

  jamescrake-merani

  committed
  947f103

  Copy full SHA for 947f103

• Got fraction units working as well :)

  jamescrake-merani

  committed
  a1b6288

  Copy full SHA for a1b6288

Commits on Sep 18, 2024

• Configure how ambiguities are dealt with.

  jamescrake-merani

  committed
  c2f4a8f

  Copy full SHA for c2f4a8f

• Only break if we have found a symbol.

  jamescrake-merani

  committed
  16adb41

  Copy full SHA for 16adb41

• Take in longest unit across the whole file.

  jamescrake-merani

  committed
  e748fcb

  Copy full SHA for e748fcb

Commits on Sep 19, 2024

• Take in a unit group in parse_singe_unit.

  jamescrake-merani

  committed
  f8a0a5a

  Copy full SHA for f8a0a5a

• Parse a unit from a specific group.

  jamescrake-merani

  committed
  a0bbd18

  Copy full SHA for a0bbd18

• Equivalent function for from group.

  jamescrake-merani

  committed
  41d1d1c

  Copy full SHA for 41d1d1c

• Is none not equal to none.

  jamescrake-merani

  committed
  462d76d

  Copy full SHA for 462d76d

• Removed old TODO comment.

  jamescrake-merani

  committed
  44bad8d

  Copy full SHA for 44bad8d

• Catch key errors.

  Show description for b8ff6be
  jamescrake-merani

  committed
  b8ff6be

  Copy full SHA for b8ff6be

• Expand the try block.

  jamescrake-merani

  committed
  1f11030

  Copy full SHA for 1f11030

• Removed an old todo comment.

  jamescrake-merani

  committed
  a5d71de

  Copy full SHA for a5d71de

Commits on Sep 20, 2024

• New unit test in pytest.

  jamescrake-merani

  committed
  98fed84

  Copy full SHA for 98fed84

• Raise an exception if the unit can't be parsed.

  jamescrake-merani

  committed
  ade0bb4

  Copy full SHA for ade0bb4

• Added some unit tests that should error.

  jamescrake-merani

  committed
  b313f4c

  Copy full SHA for b313f4c

• Created a regex validator for the unit str.

  jamescrake-merani

  committed
  3808653

  Copy full SHA for 3808653

• Throw an exception if the validation fails.

  jamescrake-merani

  committed
  25f3903

  Copy full SHA for 25f3903

• Update unit test to reflect new error.

  jamescrake-merani

  committed
  0920a66

  Copy full SHA for 0920a66

• Unit test for what I was originally testing for.

  jamescrake-merani

  committed
  0148f27

  Copy full SHA for 0148f27

Commits on Sep 23, 2024

• Added more tests for slants.

  jamescrake-merani

  committed
  06a0c9c

  Copy full SHA for 06a0c9c

• Slants should be valid unit strings as well.

  jamescrake-merani

  committed
  067929f

  Copy full SHA for 067929f

• Parse in newton as its defined value.

  jamescrake-merani

  committed
  98bfc0c

  Copy full SHA for 98bfc0c

• Remove the old testing file.

  jamescrake-merani

  committed
  8515a59

  Copy full SHA for 8515a59

• This function isn't being used.

  jamescrake-merani

  committed
  ded94f2

  Copy full SHA for ded94f2

• Added to the doc string about unit groups.

  jamescrake-merani

  committed
  3acb6e3

  Copy full SHA for 3acb6e3

• Moved the unit group to first.

  Show description for 5a45950
  jamescrake-merani

  committed
  5a45950

  Copy full SHA for 5a45950

• Small rename.

  jamescrake-merani

  committed
  606eea3

  Copy full SHA for 606eea3

• Use destructuring to make this a bit cleaner.

  jamescrake-merani

  committed
  0d272a7

  Copy full SHA for 0d272a7

• Fixed function call.

  jamescrake-merani

  committed
  d2abf95

  Copy full SHA for d2abf95

• Added some docstrings.

  jamescrake-merani

  committed
  eb8a1ec

  Copy full SHA for eb8a1ec

• Work on adding uncertainties, adding non-integer powers

  lucas-wilkins

  committed
  f466c53

  Copy full SHA for f466c53

• Integer unit powers now work

  lucas-wilkins

  committed
  c6f79af

  Copy full SHA for c6f79af

Commits on Sep 25, 2024

• Refactored parse named unit so it just takes one arg.

  jamescrake-merani

  committed
  46bbc44

  Copy full SHA for 46bbc44

• Removed old todo comment.

  jamescrake-merani

  committed
  8c1b984

  Copy full SHA for 8c1b984

• Added some docstrings.

  jamescrake-merani

  committed
  8c263b8

  Copy full SHA for 8c263b8

• Stop linter from moaning.

  jamescrake-merani

  committed
  556500e

  Copy full SHA for 556500e

• Quantities now have histories, and variance could work, needs testing though

  lucas-wilkins

  committed
  57a425e

  Copy full SHA for 57a425e

Commits on Sep 26, 2024

• Quantities ready for testing

  lucas-wilkins

  committed
  47bcefa

  Copy full SHA for 47bcefa

• Bump to python 3.12

  lucas-wilkins

  committed
  f119579

  Copy full SHA for f119579

Commits on Sep 27, 2024

• Quantity combining seems to work

  lucas-wilkins

  committed
  10f7774

  Copy full SHA for 10f7774

• Fixed error in helper function

  lucas-wilkins

  committed
  c241bda

  Copy full SHA for c241bda

• Fixed error formatting bug

  lucas-wilkins

  committed
  463de25

  Copy full SHA for 463de25

Commits on Sep 30, 2024

• Tests for error propagation

  lucas-wilkins

  committed
  250d293

  Copy full SHA for 250d293

• More aliases for units

  lucas-wilkins

  committed
  accca77

  Copy full SHA for accca77

• Made file for target object for metadata

  lucas-wilkins

  committed
  fdd06e8

  Copy full SHA for fdd06e8

• Accept spaces in the unit str.

  jamescrake-merani

  committed
  c8929c7

  Copy full SHA for c8929c7

• Split by dots as well.

  jamescrake-merani

  committed
  5f00767

  Copy full SHA for 5f00767

• Main data reading for HDF5 prototype

  lucas-wilkins

  committed
  3d62f9d

  Copy full SHA for 3d62f9d

Commits on Oct 1, 2024

• Merge branch 'refactor_24' into unit_parsing

  jamescrake-merani

  authored
  544f131

  Copy full SHA for 544f131

• Merge pull request #83 from SasView/unit_parsing

  Show description for b000b38
  jamescrake-merani

  authored
  b000b38

  Copy full SHA for b000b38

• integrating the units stuff

  lucas-wilkins

  committed
  dff1f4d

  Copy full SHA for dff1f4d

• Merge branch 'master' into refactor_24

  lucas-wilkins

  authored
  32cbb1f

  Copy full SHA for 32cbb1f

• Merge branch 'refactor_24' of https://github.com/SasView/sasdata into refactor_24

  lucas-wilkins

  committed
  b661ffd

  Copy full SHA for b661ffd

• Parsing of units in HDF5 reader

  lucas-wilkins

  committed
  a83c0dc

  Copy full SHA for a83c0dc

Commits on Oct 2, 2024

• Fixed bug where ohms, and angstroms were forbidden

  Show description for 8bf4340
  jamescrake-merani

  committed
  8bf4340

  Copy full SHA for 8bf4340

• Accept the ^ char but don't do anything with it.

  jamescrake-merani

  committed
  b821285

  Copy full SHA for b821285

• Fixed moles potentially

  lucas-wilkins

  committed
  c9de771

  Copy full SHA for c9de771

• Merge branch 'refactor_24' into unit_unicode_symbol_fix

  jamescrake-merani

  authored
  36b08fc

  Copy full SHA for 36b08fc

• Unit name fixes

  lucas-wilkins

  committed
  426eb94

  Copy full SHA for 426eb94

Commits on Oct 3, 2024

• Filling in some of the working for the accessors

  lucas-wilkins

  committed
  ff26117

  Copy full SHA for ff26117

• Merge pull request #84 from SasView/unit_unicode_symbol_fix

  Show description for 80610ac
  lucas-wilkins

  authored
  80610ac

  Copy full SHA for 80610ac

• Remove target data object attempt

  lucas-wilkins

  committed
  cc44356

  Copy full SHA for cc44356

Commits on Oct 7, 2024

• Connecting metadata

  lucas-wilkins

  committed
  7ab4bb9

  Copy full SHA for 7ab4bb9

• Accessor changes

  lucas-wilkins

  committed
  ad1ba33

  Copy full SHA for ad1ba33

• Merge branch 'refactor_24' of https://github.com/SasView/sasdata into refactor_24

  Show description for c3b677f
  lucas-wilkins

  committed
  c3b677f

  Copy full SHA for c3b677f

• Merge tidying

  lucas-wilkins

  committed
  d1ef1d4

  Copy full SHA for d1ef1d4

• Metadata linked up, just not pointing in the right place right now

  lucas-wilkins

  committed
  f07f261

  Copy full SHA for f07f261

• Added some debugging info to the summary

  lucas-wilkins

  committed
  aa13492

  Copy full SHA for aa13492

• Debugging metadata

  lucas-wilkins

  committed
  fb10792

  Copy full SHA for fb10792

• Better reference methods

  lucas-wilkins

  committed
  df6d045

  Copy full SHA for df6d045

Commits on Oct 15, 2024

• Merge branch 'refactor_24' into 48-fractional-binning

  lucas-wilkins

  authored
  6df7930

  Copy full SHA for 6df7930