Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
JortDijkstra committed Jun 12, 2024
2 parents 851cce3 + 006b648 commit 81ace80
Show file tree
Hide file tree
Showing 243 changed files with 229 additions and 110 deletions.
Binary file removed Test Data/2371_crop/1000.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1001.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1002.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1003.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1004.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1005.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1006.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1007.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1008.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1009.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1010.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1011.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1012.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1013.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1014.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1015.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1016.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1236.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1237.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1238.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1239.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1240.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1241.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1242.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1243.png
Binary file not shown.
Binary file removed Test Data/2371_crop/1244.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1245.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1246.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1247.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1248.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1249.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1250.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1251.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1252.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1253.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1254.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1255.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1256.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/516.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/517.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/518.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/520.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/521.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/522.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/523.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/524.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/525.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/527.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/528.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/529.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/530.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/531.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/532.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/533.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/534.png
Diff not rendered.
Binary file removed Test Data/2371_crop/145100/536.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1476.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1477.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1478.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1479.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1480.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1481.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1482.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1483.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1484.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1485.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1486.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1487.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1488.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1489.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1490.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1491.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1492.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1493.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1494.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1495.png
Diff not rendered.
Binary file removed Test Data/2371_crop/1496.png
Diff not rendered.
Binary file removed Test Data/2371_crop/516.png
Diff not rendered.
Binary file removed Test Data/2371_crop/517.png
Diff not rendered.
Binary file removed Test Data/2371_crop/518.png
Diff not rendered.
Binary file removed Test Data/2371_crop/519.png
Diff not rendered.
Binary file removed Test Data/2371_crop/520.png
Diff not rendered.
Binary file removed Test Data/2371_crop/521.png
Diff not rendered.
Binary file removed Test Data/2371_crop/522.png
Diff not rendered.
Binary file removed Test Data/2371_crop/523.png
Diff not rendered.
Binary file removed Test Data/2371_crop/524.png
Diff not rendered.
Binary file removed Test Data/2371_crop/525.png
Diff not rendered.
Binary file removed Test Data/2371_crop/526.png
Diff not rendered.
Binary file removed Test Data/2371_crop/527.png
Diff not rendered.
Binary file removed Test Data/2371_crop/528.png
Diff not rendered.
Binary file removed Test Data/2371_crop/529.png
Diff not rendered.
Binary file removed Test Data/2371_crop/530.png
Diff not rendered.
Binary file removed Test Data/2371_crop/531.png
Diff not rendered.
Binary file removed Test Data/2371_crop/532.png
Diff not rendered.
Binary file removed Test Data/2371_crop/533.png
Diff not rendered.
Binary file removed Test Data/2371_crop/534.png
Diff not rendered.
Binary file removed Test Data/2371_crop/535.png
Diff not rendered.
Binary file removed Test Data/2371_crop/536.png
Diff not rendered.
Binary file removed Test Data/2371_crop/756.png
Diff not rendered.
Binary file removed Test Data/2371_crop/757.png
Diff not rendered.
Binary file removed Test Data/2371_crop/758.png
Diff not rendered.
Binary file removed Test Data/2371_crop/759.png
Diff not rendered.
Binary file removed Test Data/2371_crop/760.png
Diff not rendered.
Binary file removed Test Data/2371_crop/761.png
Diff not rendered.
Binary file removed Test Data/2371_crop/762.png
Diff not rendered.
Binary file removed Test Data/2371_crop/763.png
Diff not rendered.
Binary file removed Test Data/2371_crop/764.png
Diff not rendered.
Binary file removed Test Data/2371_crop/765.png
Diff not rendered.
Binary file removed Test Data/2371_crop/766.png
Diff not rendered.
Binary file removed Test Data/2371_crop/767.png
Diff not rendered.
Binary file removed Test Data/2371_crop/768.png
Diff not rendered.
Binary file removed Test Data/2371_crop/769.png
Diff not rendered.
Binary file removed Test Data/2371_crop/770.png
Diff not rendered.
Binary file removed Test Data/2371_crop/771.png
Diff not rendered.
Binary file removed Test Data/2371_crop/772.png
Diff not rendered.
Binary file removed Test Data/2371_crop/773.png
Diff not rendered.
Binary file removed Test Data/2371_crop/774.png
Diff not rendered.
Binary file removed Test Data/2371_crop/775.png
Diff not rendered.
Binary file removed Test Data/2371_crop/776.png
Diff not rendered.
Binary file removed Test Data/2371_crop/996.png
Diff not rendered.
Binary file removed Test Data/2371_crop/997.png
Diff not rendered.
Binary file removed Test Data/2371_crop/998.png
Diff not rendered.
Binary file removed Test Data/2371_crop/999.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/540.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/541.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/542.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/543.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/544.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/545.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/546.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/548.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/549.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/550.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/551.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/552.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/553.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/555.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/556.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/557.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/558.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/559.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145157/560.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/780.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/781.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/782.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/783.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/784.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/785.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/786.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/787.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/788.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/789.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/790.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/791.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/792.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/793.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/794.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/795.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/796.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/797.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/798.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/799.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145158/800.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1020.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1021.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1022.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1023.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1024.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1025.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1026.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1027.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1028.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1029.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1030.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1031.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1032.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1033.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1034.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1035.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1036.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1037.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1038.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1039.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145159/1040.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1260.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1261.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1262.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1263.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1264.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1265.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1266.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1267.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1268.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1269.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1270.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1271.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1272.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1273.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1274.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1275.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1276.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1277.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1278.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1279.png
Diff not rendered.
Binary file removed Test Data/2372_crop/145200/1280.png
Diff not rendered.
Binary file removed Test Data/crazy/10297.png
Diff not rendered.
Binary file removed Test Data/crazy/10298.png
Diff not rendered.
Binary file removed Test Data/crazy/10337.png
Diff not rendered.
Binary file removed Test Data/crazy/10338.png
Diff not rendered.
Binary file removed Test Data/crazy/10377.png
Diff not rendered.
Binary file removed Test Data/crazy/10378.png
Diff not rendered.
Binary file removed Test Data/crazy/10417.png
Diff not rendered.
Binary file removed Test Data/crazy/10418.png
Diff not rendered.
Binary file removed Test Data/crazy/10457.png
Diff not rendered.
Binary file removed Test Data/crazy/10458.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/516.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/517.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/518.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/520.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/521.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/522.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/523.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/524.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/525.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/527.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/528.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/529.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/530.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/531.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/532.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/533.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/534.png
Diff not rendered.
Binary file removed Test Data/eersteseconde/536.png
Diff not rendered.
Binary file removed Test Data/ff/225.png
Diff not rendered.
Binary file removed Test Data/ff/226.png
Diff not rendered.
Binary file removed Test Data/gg/vortex_pair_particles_1.tif
Binary file not shown.
Binary file removed Test Data/gg/vortex_pair_particles_2.tif
Binary file not shown.
Binary file removed Test Data/hh/00101.jpg
Diff not rendered.
Binary file removed Test Data/hh/00102.jpg
Diff not rendered.
331 changes: 223 additions & 108 deletions experiments/PIV Test.ipynb

Large diffs are not rendered by default.

Binary file removed experiments/hybrid.gif
Diff not rendered.
1 change: 1 addition & 0 deletions src/SIV_library/advanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def ctf_optical(optical: OpticalFlow, num_passes: int = 3, scale_factor: float =
resize.apply_to = ['a', 'b'] # apply the resize transform to both images in the pair
warp = Warp(x, y, u, v)

optical.dataset.img_shape = size
optical.dataset.transforms = [resize, warp]

_, _, du, dv = optical.run()
Expand Down
7 changes: 5 additions & 2 deletions src/SIV_library/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@

class SIVDataset(Dataset):
def __init__(self, folder: str, transforms: list | None = None, device: str = "cpu") -> None:
# assume the files are sorted and all have the correct file type
# assume the files have the correct file type
filenames = [os.path.join(folder, name) for name in os.listdir(folder)]
filenames.sort(key=lambda x: int(os.path.split(x)[-1].split('.')[0]))

self.img_pairs = list(zip(filenames[:-1], filenames[1:]))
self.idx = [int(os.path.split(x)[-1].split('.')[0]) for x in filenames]

self.img_shape = cv2.imread(filenames[0], cv2.IMREAD_GRAYSCALE).shape
self.transforms = transforms
self.device = device

self.img_shape = cv2.imread(filenames[0], cv2.IMREAD_GRAYSCALE).shape

def __len__(self) -> int:
return len(self.img_pairs)

Expand Down

0 comments on commit 81ace80

Please sign in to comment.