feat(radon): include empty median in RADON

witnet · Aug 30, 2021 · a1785c4 · a1785c4
1 parent a87a52c
commit a1785c4
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 16 deletions.
diff --git a/rad/src/operators/array.rs b/rad/src/operators/array.rs
@@ -24,7 +24,11 @@ pub fn count(input: &RadonArray) -> RadonInteger {
     RadonInteger::from(input.value().len() as i128)
 }
 
-pub fn reduce(input: &RadonArray, args: &[Value]) -> Result<RadonTypes, RadError> {
+pub fn reduce(
+    input: &RadonArray,
+    args: &[Value],
+    context: &mut ReportContext<RadonTypes>,
+) -> Result<RadonTypes, RadError> {
     let wrong_args = || RadError::WrongArguments {
         input_type: RadonArray::radon_type_name(),
         operator: "Reduce".to_string(),
@@ -39,7 +43,7 @@ pub fn reduce(input: &RadonArray, args: &[Value]) -> Result<RadonTypes, RadError
     let reducer_integer = from_value::<u8>(arg).map_err(|_| wrong_args())?;
     let reducer_code = RadonReducers::try_from(reducer_integer).map_err(|_| wrong_args())?;
 
-    reducers::reduce(input, reducer_code)
+    reducers::reduce(input, reducer_code, context)
 }
 
 pub fn get(input: &RadonArray, args: &[Value]) -> Result<RadonTypes, RadError> {
@@ -395,7 +399,7 @@ mod tests {
         ]);
         let args = &[];
 
-        let result = reduce(input, args);
+        let result = reduce(input, args, &mut ReportContext::default());
 
         assert_eq!(
             &result.unwrap_err().to_string(),
@@ -411,7 +415,7 @@ mod tests {
         ]);
         let args = &[Value::Text(String::from("wrong"))]; // This is RadonReducers::AverageMean
 
-        let result = reduce(input, args);
+        let result = reduce(input, args, &mut ReportContext::default());
 
         assert_eq!(
             &result.unwrap_err().to_string(),
@@ -427,7 +431,7 @@ mod tests {
         ]);
         let args = &[Value::Integer(-1)]; // This doesn't match any reducer code in RadonReducers
 
-        let result = reduce(input, args);
+        let result = reduce(input, args, &mut ReportContext::default());
 
         assert_eq!(
             &result.unwrap_err().to_string(),

diff --git a/rad/src/reducers/average.rs b/rad/src/reducers/average.rs
@@ -125,6 +125,11 @@ pub fn mean(input: &RadonArray, return_policy: MeanReturnPolicy) -> Result<Radon
     }
 }
 
+pub fn median(_input: &RadonArray) -> Result<RadonTypes, RadError> {
+    // TODO: implement
+    Ok(RadonTypes::Array(RadonArray::from(vec![])))
+}
+
 #[cfg(test)]
 mod tests {
     use serde_cbor::Value;
@@ -135,6 +140,7 @@ mod tests {
     };
 
     use super::*;
+    use witnet_data_structures::radon_report::ReportContext;
 
     #[test]
     fn test_reduce_average_mean_float() {
@@ -145,7 +151,7 @@ mod tests {
         let args = &[Value::Integer(RadonReducers::AverageMean as i128)];
         let expected = RadonTypes::from(RadonFloat::from(1.5f64));
 
-        let output = reduce(input, args).unwrap();
+        let output = reduce(input, args, &mut ReportContext::default()).unwrap();
 
         assert_eq!(output, expected);
     }
@@ -168,7 +174,7 @@ mod tests {
         ]));
 
         let args = &[Value::Integer(0x03)]; // This is RadonReducers::AverageMean
-        let output = reduce(&input, args).unwrap();
+        let output = reduce(&input, args, &mut ReportContext::default()).unwrap();
 
         assert_eq!(output, expected);
     }
@@ -193,7 +199,7 @@ mod tests {
         };
 
         let args = &[Value::Integer(0x03)]; // This is RadonReducers::AverageMean
-        let output = reduce(&input, args).unwrap_err();
+        let output = reduce(&input, args, &mut ReportContext::default()).unwrap_err();
 
         assert_eq!(output, expected);
     }
@@ -244,7 +250,7 @@ mod tests {
         let expected = RadonTypes::from(RadonArray::from(vec![array_e1, array_e2, array_e3]));
 
         let args = &[Value::Integer(0x03)]; // This is RadonReducers::AverageMean
-        let output = reduce(&input, args).unwrap();
+        let output = reduce(&input, args, &mut ReportContext::default()).unwrap();
 
         assert_eq!(output, expected);
     }
@@ -265,7 +271,7 @@ mod tests {
         let args = &[Value::Integer(RadonReducers::AverageMean as i128)];
         let expected = RadonTypes::Integer(RadonInteger::from(2));
 
-        let output = reduce(input, args).unwrap();
+        let output = reduce(input, args, &mut ReportContext::default()).unwrap();
 
         assert_eq!(output, expected);
     }
@@ -288,7 +294,7 @@ mod tests {
         ]));
 
         let args = &[Value::Integer(RadonReducers::AverageMean as i128)];
-        let output = reduce(&input, args).unwrap();
+        let output = reduce(&input, args, &mut ReportContext::default()).unwrap();
 
         assert_eq!(output, expected);
     }
@@ -300,7 +306,7 @@ mod tests {
             RadonString::from("world").into(),
         ]);
         let args = &[Value::Integer(0x03)]; // This is RadonReducers::AverageMean
-        let output = reduce(input, args).unwrap_err();
+        let output = reduce(input, args, &mut ReportContext::default()).unwrap_err();
 
         let expected = RadError::UnsupportedReducer {
             array: input.clone(),
@@ -329,7 +335,7 @@ mod tests {
         };
 
         let args = &[Value::Integer(0x03)]; // This is RadonReducers::AverageMean
-        let output = reduce(&input, args).unwrap_err();
+        let output = reduce(&input, args, &mut ReportContext::default()).unwrap_err();
 
         assert_eq!(output, expected);
     }

diff --git a/rad/src/reducers/mod.rs b/rad/src/reducers/mod.rs
@@ -6,6 +6,7 @@ use crate::{
     error::RadError,
     types::{array::RadonArray, RadonType, RadonTypes},
 };
+use witnet_data_structures::radon_report::ReportContext;
 
 pub mod average;
 pub mod deviation;
@@ -17,13 +18,13 @@ pub enum RadonReducers {
     // Implemented
     Mode = 0x02,
     AverageMean = 0x03,
+    AverageMedian = 0x05,
     DeviationStandard = 0x07,
 
     // Not implemented
     Min = 0x00,
     Max = 0x01,
     AverageMeanWeighted = 0x04,
-    AverageMedian = 0x05,
     AverageMedianWeighted = 0x06,
     DeviationAverageAbsolute = 0x08,
     DeviationMedianAbsolute = 0x09,
@@ -36,7 +37,11 @@ impl fmt::Display for RadonReducers {
     }
 }
 
-pub fn reduce(input: &RadonArray, reducer_code: RadonReducers) -> Result<RadonTypes, RadError> {
+pub fn reduce(
+    input: &RadonArray,
+    reducer_code: RadonReducers,
+    context: &mut ReportContext<RadonTypes>,
+) -> Result<RadonTypes, RadError> {
     let error = || {
         Err(RadError::UnsupportedReducer {
             array: input.clone(),
@@ -51,6 +56,10 @@ pub fn reduce(input: &RadonArray, reducer_code: RadonReducers) -> Result<RadonTy
             }
             RadonReducers::Mode => mode::mode(input),
             RadonReducers::DeviationStandard => deviation::standard(input),
+            RadonReducers::AverageMedian => match &context.active_wips {
+                Some(active_wips) if active_wips.wip0017() => average::median(input),
+                _ => error(),
+            },
             _ => error(),
         }
     } else {

diff --git a/rad/src/types/array.rs b/rad/src/types/array.rs
@@ -149,7 +149,7 @@ impl Operable for RadonArray {
                 array_operators::map(self, args.as_slice(), &mut ReportContext::default())
             }
             (RadonOpCodes::ArrayReduce, Some(args)) => {
-                array_operators::reduce(self, args.as_slice())
+                array_operators::reduce(self, args.as_slice(), &mut ReportContext::default())
             }
             (RadonOpCodes::ArraySort, Some(args)) => {
                 array_operators::sort(self, args.as_slice(), &mut ReportContext::default())
@@ -175,6 +175,9 @@ impl Operable for RadonArray {
             (RadonOpCodes::ArrayMap, Some(args)) => {
                 array_operators::map(self, args.as_slice(), context)
             }
+            (RadonOpCodes::ArrayReduce, Some(args)) => {
+                array_operators::reduce(self, args.as_slice(), context)
+            }
             (RadonOpCodes::ArraySort, Some(args)) => {
                 array_operators::sort(self, args.as_slice(), context)
             }