foscat 3.2.0__py3-none-any.whl → 3.3.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. foscat/CircSpline.py +61 -40
  2. foscat/FoCUS.py +3 -3
  3. foscat/Softmax.py +1 -1
  4. foscat/Spline1D.py +88 -42
  5. foscat/Synthesis.py +23 -9
  6. foscat/alm.py +134 -0
  7. foscat/backend.py +44 -25
  8. foscat/backend_tens.py +2 -1
  9. foscat/loss_backend_torch.py +0 -1
  10. foscat/scat.py +15 -6
  11. foscat/scat1D.py +15 -6
  12. foscat/scat_cov.py +993 -931
  13. foscat/scat_cov1D.py +2 -2
  14. foscat/scat_cov2D.py +2 -2
  15. foscat/scat_cov_map.py +16 -16
  16. foscat/scat_cov_map2D.py +16 -16
  17. {foscat-3.2.0.dist-info → foscat-3.3.0.dist-info}/METADATA +39 -30
  18. foscat-3.3.0.dist-info/RECORD +26 -0
  19. {foscat-3.2.0.dist-info → foscat-3.3.0.dist-info}/WHEEL +1 -1
  20. foscat/scat_cov1D.old.py +0 -1547
  21. foscat-3.2.0.dist-info/RECORD +0 -26
  22. {foscat-3.2.0.dist-info → foscat-3.3.0.dist-info}/LICENCE +0 -0
  23. {foscat-3.2.0.dist-info → foscat-3.3.0.dist-info}/top_level.txt +0 -0
foscat/scat.py CHANGED
@@ -1081,10 +1081,16 @@ class scat:
1081
1081
  """
1082
1082
 
1083
1083
  for l_scale in range(nscale - k):
1084
- i0 = np.where((j1 == nscale - 1 - k - l_scale) * (j2 == nscale - 1 - k))[0]
1084
+ i0 = np.where(
1085
+ (j1 == nscale - 1 - k - l_scale) * (j2 == nscale - 1 - k)
1086
+ )[0]
1085
1087
  i1 = np.where((j1 == nscale - 1 - k - l_scale) * (j2 == nscale - k))[0]
1086
- i2 = np.where((j1 == nscale - 1 - k - l_scale) * (j2 == nscale + 1 - k))[0]
1087
- i3 = np.where((j1 == nscale - 1 - k - l_scale) * (j2 == nscale + 2 - k))[0]
1088
+ i2 = np.where(
1089
+ (j1 == nscale - 1 - k - l_scale) * (j2 == nscale + 1 - k)
1090
+ )[0]
1091
+ i3 = np.where(
1092
+ (j1 == nscale - 1 - k - l_scale) * (j2 == nscale + 2 - k)
1093
+ )[0]
1088
1094
 
1089
1095
  if constant:
1090
1096
  s2[:, i0] = s2[:, i1]
@@ -1134,16 +1140,19 @@ class scat:
1134
1140
  for k in range(nscale):
1135
1141
  for l_scale in range(1, nscale):
1136
1142
  i0 = np.where(
1137
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale - 1 - k - l_scale)
1143
+ (j1 == 2 * nscale - 1 - k)
1144
+ * (j2 == 2 * nscale - 1 - k - l_scale)
1138
1145
  )[0]
1139
1146
  i1 = np.where(
1140
1147
  (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale - k - l_scale)
1141
1148
  )[0]
1142
1149
  i2 = np.where(
1143
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale + 1 - k - l_scale)
1150
+ (j1 == 2 * nscale - 1 - k)
1151
+ * (j2 == 2 * nscale + 1 - k - l_scale)
1144
1152
  )[0]
1145
1153
  i3 = np.where(
1146
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale + 2 - k - l_scale)
1154
+ (j1 == 2 * nscale - 1 - k)
1155
+ * (j2 == 2 * nscale + 2 - k - l_scale)
1147
1156
  )[0]
1148
1157
  if constant:
1149
1158
  s2[:, i0] = s2[:, i1]
foscat/scat1D.py CHANGED
@@ -907,10 +907,16 @@ class scat1D:
907
907
  """
908
908
 
909
909
  for l_orient in range(nscale - k):
910
- i0 = np.where((j1 == nscale - 1 - k - l_orient) * (j2 == nscale - 1 - k))[0]
910
+ i0 = np.where(
911
+ (j1 == nscale - 1 - k - l_orient) * (j2 == nscale - 1 - k)
912
+ )[0]
911
913
  i1 = np.where((j1 == nscale - 1 - k - l_orient) * (j2 == nscale - k))[0]
912
- i2 = np.where((j1 == nscale - 1 - k - l_orient) * (j2 == nscale + 1 - k))[0]
913
- i3 = np.where((j1 == nscale - 1 - k - l_orient) * (j2 == nscale + 2 - k))[0]
914
+ i2 = np.where(
915
+ (j1 == nscale - 1 - k - l_orient) * (j2 == nscale + 1 - k)
916
+ )[0]
917
+ i3 = np.where(
918
+ (j1 == nscale - 1 - k - l_orient) * (j2 == nscale + 2 - k)
919
+ )[0]
914
920
 
915
921
  if constant:
916
922
  s2[:, i0] = s2[:, i1]
@@ -960,16 +966,19 @@ class scat1D:
960
966
  for k in range(nscale):
961
967
  for l_orient in range(1, nscale):
962
968
  i0 = np.where(
963
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale - 1 - k - l_orient)
969
+ (j1 == 2 * nscale - 1 - k)
970
+ * (j2 == 2 * nscale - 1 - k - l_orient)
964
971
  )[0]
965
972
  i1 = np.where(
966
973
  (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale - k - l_orient)
967
974
  )[0]
968
975
  i2 = np.where(
969
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale + 1 - k - l_orient)
976
+ (j1 == 2 * nscale - 1 - k)
977
+ * (j2 == 2 * nscale + 1 - k - l_orient)
970
978
  )[0]
971
979
  i3 = np.where(
972
- (j1 == 2 * nscale - 1 - k) * (j2 == 2 * nscale + 2 - k - l_orient)
980
+ (j1 == 2 * nscale - 1 - k)
981
+ * (j2 == 2 * nscale + 2 - k - l_orient)
973
982
  )[0]
974
983
  if constant:
975
984
  s2[:, i0] = s2[:, i1]