Bump cdshealpix to v0.6.8, add 'CellSelection' in methods building a …

…RangeMOC from a BMOC
cds-astro · May 14, 2024 · ab59a8e · ab59a8e
1 parent 5ae3c1f
commit ab59a8e
Show file tree

Hide file tree

Showing 19 changed files with 752 additions and 356 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # `moc` Change Log
 
+## 0.13.0
+
+Released 2024-05-14
+
+### Added
+
+* `CellSelection` in methods building a RangeMOC from a BMOC
+* `mutliresolution/order map (mom or mrm) sum`
+
+### Changed
+
+* Bump cdshealpix to 0.6.8
+
+
 ## 0.12.1
 
 Released 2023-12-20
@@ -9,6 +23,7 @@ Released 2023-12-20
 * Bugs in the stcs2moc: allky not complete + intesection error comming from cdshealpix BMOC
 * Update CDSHealpix
 
+
 ## 0.12.0
 
 Released 2023-12-11

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "moc"
-version = "0.12.1"
+version = "0.13.0"
 authors = [
   "F.-X. Pineau <[email protected]>",
   "Matthieu Baumann <[email protected]>"
@@ -44,7 +44,7 @@ exclude = ["crates/wasm"]
 num = "0.4.1"
 nom = "7.1.3"
 quick-error = "2.0.1"
-healpix = { package = "cdshealpix", version = "0.6.7" }
+healpix = { package = "cdshealpix", version = "0.6.8" }
 mapproj = "0.3"
 serde_json = "1.0"
 byteorder = "1.4.3"

diff --git a/benches/moc_multi_or.rs b/benches/moc_multi_or.rs
@@ -1,15 +1,12 @@
-use std::error::Error;
-use std::fs;
-use std::num::ParseFloatError;
-use std::path::PathBuf;
+use std::{error::Error, fs, num::ParseFloatError, path::PathBuf};
 
 use criterion::{criterion_group, criterion_main, Criterion};
 
 use moc::{
   elemset::range::MocRanges,
   idx::Idx,
   moc::{
-    range::{op::or::or, RangeMOC},
+    range::{op::or::or, CellSelection, RangeMOC},
     RangeMOCIntoIterator, RangeMOCIterator,
   },
   qty::{Hpx, MocQty},
@@ -592,7 +589,7 @@ fn create_cones_mocs() -> Vec<RangeMOC<u64, Hpx<u64>>> {
       let lon = lon_deg.to_radians();
       let lat = lat_deg.to_radians();
       let radius = radius.to_radians();
-      RangeMOC::from_cone(lon, lat, radius, 12, 2)
+      RangeMOC::from_cone(lon, lat, radius, 12, 2, CellSelection::All)
     })
     .collect()
 }
@@ -622,7 +619,7 @@ fn create_polygones_mocs() -> Vec<RangeMOC<u64, Hpx<u64>>> {
         })
         .collect::<Result<Vec<(f64, f64)>, Box<dyn Error>>>()
         .unwrap();
-      RangeMOC::from_polygon(&vertices, false, 12)
+      RangeMOC::from_polygon(&vertices, false, 12, CellSelection::All)
     })
     .collect()
 }

diff --git a/crates/cli/CHANGELOG.md b/crates/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `moc-cli` Change Log
 
+## 0.9.0
+
+Released 2024-05-14
+
+* Add `moc op momsum`
+* Bump cdshealpix to 0.6.8
+
+
 ## 0.8.2
 
 Released 2024-01-31

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -24,7 +24,7 @@ test = false
 moclib = { package = "moc", path = "../.." }
 num = "0.4"
 structopt = "0.3"
-healpix = { package = "cdshealpix", version = "0.6.7" }
+healpix = { package = "cdshealpix", version = "0.6.8" }
 mapproj = "0.3.0"
 rayon = "1.5.1"
 time = { version = "0.3.3", features = ["parsing"] }