Merge pull request #11 from julianmendez/development

Remove redundant tiles
julianmendez · Mar 8, 2024 · ed9bd8b · ed9bd8b
2 parents c6b6ac7 + d37066c
commit ed9bd8b
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 117 deletions.
diff --git a/core/src/main/scala/soda/tiles/fairness/pipeline/Package.scala b/core/src/main/scala/soda/tiles/fairness/pipeline/Package.scala
@@ -28,14 +28,12 @@ import   soda.tiles.fairness.tile.FalsePosTile
 import   soda.tiles.fairness.tile.NeededPTile
 import   soda.tiles.fairness.tile.PredictionPTile
 import   soda.tiles.fairness.tile.ReceivedSigmaPTile
-import   soda.tiles.fairness.tile.ResultPTile
 import   soda.tiles.fairness.tile.SigmaTile
 import   soda.tiles.fairness.tile.UnzipPairFstTile
 import   soda.tiles.fairness.tile.UnzipPairSndTile
 import   soda.tiles.fairness.tile.UnzipTripleFstTile
 import   soda.tiles.fairness.tile.UnzipTripleSndTile
 import   soda.tiles.fairness.tile.UnzipTripleTrdTile
-import   soda.tiles.fairness.tile.WithPTile
 import   soda.tiles.fairness.tile.ZipTile
 
 
@@ -190,9 +188,9 @@ trait UnbiasednessPipeline
 
   lazy val prediction_p_tile = PredictionPTile .mk (p0_evaluation)
 
-  lazy val result_p_tile = ResultPTile .mk (p1_result)
+  lazy val result_p_tile = AttributePTile .mk (p1_result)
 
-  lazy val with_p_tile = WithPTile .mk (p2_with_p)
+  lazy val with_p_tile = AttributePTile .mk (p2_with_p)
 
   lazy val false_pos_tile = FalsePosTile .mk
 

diff --git a/core/src/main/scala/soda/tiles/fairness/pipeline/Package.soda b/core/src/main/scala/soda/tiles/fairness/pipeline/Package.soda
@@ -29,13 +29,11 @@ import
   soda.tiles.fairness.tile.NeededPTile
   soda.tiles.fairness.tile.PredictionPTile
   soda.tiles.fairness.tile.ReceivedSigmaPTile
-  soda.tiles.fairness.tile.ResultPTile
   soda.tiles.fairness.tile.SigmaTile
   soda.tiles.fairness.tile.UnzipPairFstTile
   soda.tiles.fairness.tile.UnzipPairSndTile
   soda.tiles.fairness.tile.UnzipTripleFstTile
   soda.tiles.fairness.tile.UnzipTripleSndTile
   soda.tiles.fairness.tile.UnzipTripleTrdTile
-  soda.tiles.fairness.tile.WithPTile
   soda.tiles.fairness.tile.ZipTile
 
diff --git a/core/src/main/scala/soda/tiles/fairness/pipeline/UnbiasednessPipeline.soda b/core/src/main/scala/soda/tiles/fairness/pipeline/UnbiasednessPipeline.soda
@@ -37,9 +37,9 @@ class UnbiasednessPipeline
 
   prediction_p_tile = PredictionPTile .mk (p0_evaluation)
 
-  result_p_tile = ResultPTile .mk (p1_result)
+  result_p_tile = AttributePTile .mk (p1_result)
 
-  with_p_tile = WithPTile .mk (p2_with_p)
+  with_p_tile = AttributePTile .mk (p2_with_p)
 
   false_pos_tile = FalsePosTile .mk
 

diff --git a/core/src/main/scala/soda/tiles/fairness/tile/Package.scala b/core/src/main/scala/soda/tiles/fairness/tile/Package.scala
@@ -677,35 +677,6 @@ object ReceivedSigmaPTile {
 }
 
 
-/*
-directive lean
-import Soda.tiles.fairness.tool.TileMessage
-import Soda.tiles.fairness.tile.AttributePTile
-*/
-
-/**
- * This tile is a particular case of an 'AttributePTile', where the attribute is the 'result'.
- * This tile is used to contrast obtained results to predicted results.
- */
-
-trait ResultPTile
-{
-
-  def   p : Actor => Measure
-
-  def apply (message : TileMessage [Seq [Actor] ] ) : TileMessage [Seq [Measure] ] =
-    AttributePTile .mk (p) .apply (message)
-
-}
-
-case class ResultPTile_ (p : Actor => Measure) extends ResultPTile
-
-object ResultPTile {
-  def mk (p : Actor => Measure) : ResultPTile =
-    ResultPTile_ (p)
-}
-
-
 /*
 directive lean
 import Soda.tiles.fairness.tool.TileMessage
@@ -912,34 +883,6 @@ object UnzipTripleTrdTile {
 }
 
 
-/*
-directive lean
-import Soda.tiles.fairness.tool.TileMessage
-import Soda.tiles.fairness.tile.AttributePTile
-*/
-
-/**
- * This tile is a particular case of a 'AttributePTile', that projects given property.
- */
-
-trait WithPTile
-{
-
-  def   p : Actor => Measure
-
-  def apply (message : TileMessage [Seq [Actor] ] ) : TileMessage [Seq [Measure] ] =
-    AttributePTile .mk (p) .apply (message)
-
-}
-
-case class WithPTile_ (p : Actor => Measure) extends WithPTile
-
-object WithPTile {
-  def mk (p : Actor => Measure) : WithPTile =
-    WithPTile_ (p)
-}
-
-
 /*
 directive lean
 import Soda.tiles.fairness.tool.TileMessage

diff --git a/core/src/main/scala/soda/tiles/fairness/tile/ResultPTile.soda b/core/src/main/scala/soda/tiles/fairness/tile/ResultPTile.soda
diff --git a/core/src/main/scala/soda/tiles/fairness/tile/WithPTile.soda b/core/src/main/scala/soda/tiles/fairness/tile/WithPTile.soda
diff --git a/docs/scoring_example.md b/docs/scoring_example.md
@@ -11,9 +11,9 @@ These are some of the implemented fairness tiles for scoring scenarios:
 |:---------------------------------------------------|:---------------------------------------------|
 | all-actor <sub>*(a0), (a1), (a2)*</sub>            | [AllActorTripleTile][AllActorTripleTile]     |
 | <sub>*(a)*</sub> prediction <sub>*(m)*</sub>       | [PredictionPTile][PredictionPTile]           |
-| <sub>*(a)*</sub> result <sub>*(m)*</sub>           | [ResultPTile][ResultPTile]                   |
+| <sub>*(a)*</sub> result <sub>*(m)*</sub>           | [AttributePTile][AttributePTile]             |
 | <sub>*(m0), (m1)*</sub> false-pos <sub>*(m)*</sub> | [FalsePosTile][FalsePosTile]                 |
-| <sub>*(a)*</sub> with <sub>*(m)*</sub>             | [WithPTile][WithPTile]                       |
+| <sub>*(a)*</sub> with <sub>*(m)*</sub>             | [AttributePTile][AttributePTile]             |
 | <sub>*(m0), (m1)*</sub> correlation <sub>*m*</sub> | [CorrelationTile][CorrelationTile]           |
 | <sub>*m*</sub> decision <sub>*b*</sub>             | [DecisionTile][DecisionTile]                 |
 | unbiasedness <sub>*b*</sub>                        | [UnbiasednessPipeline][UnbiasednessPipeline] |
@@ -40,9 +40,8 @@ graph LR
 
 [AllActorTripleTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/AllActorTripleTile.soda
 [PredictionPTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/PredictionPTile.soda
-[ResultPTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/ResultPTile.soda
+[AttributePTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/AttributePTile.soda
 [FalsePosTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/FalsePosTile.soda
-[WithPTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/WithPTile.soda
 [CorrelationTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/CorrelationTile.soda
 [DecisionTile]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/tile/DecisionTile.soda
 [UnbiasednessPipeline]: https://github.com/julianmendez/tiles/blob/master/core/src/main/scala/soda/tiles/fairness/pipeline/UnbiasednessPipeline.soda

diff --git a/examples/src/main/scala/soda/tiles/fairness/example/childcaresubsidy/Package.scala b/examples/src/main/scala/soda/tiles/fairness/example/childcaresubsidy/Package.scala
@@ -27,14 +27,12 @@ import   soda.tiles.fairness.tile.MapPTile
 import   soda.tiles.fairness.tile.NeededPTile
 import   soda.tiles.fairness.tile.PredictionPTile
 import   soda.tiles.fairness.tile.ReceivedSigmaPTile
-import   soda.tiles.fairness.tile.ResultPTile
 import   soda.tiles.fairness.tile.SigmaTile
 import   soda.tiles.fairness.tile.UnzipPairFstTile
 import   soda.tiles.fairness.tile.UnzipPairSndTile
 import   soda.tiles.fairness.tile.UnzipTripleFstTile
 import   soda.tiles.fairness.tile.UnzipTripleSndTile
 import   soda.tiles.fairness.tile.UnzipTripleTrdTile
-import   soda.tiles.fairness.tile.WithPTile
 import   soda.tiles.fairness.tile.ZipTile
 import   soda.tiles.fairness.pipeline.EqualityPipeline
 import   soda.tiles.fairness.pipeline.EquityPipeline

diff --git a/examples/src/main/scala/soda/tiles/fairness/example/childcaresubsidy/Package.soda b/examples/src/main/scala/soda/tiles/fairness/example/childcaresubsidy/Package.soda
@@ -28,14 +28,12 @@ import
   soda.tiles.fairness.tile.NeededPTile
   soda.tiles.fairness.tile.PredictionPTile
   soda.tiles.fairness.tile.ReceivedSigmaPTile
-  soda.tiles.fairness.tile.ResultPTile
   soda.tiles.fairness.tile.SigmaTile
   soda.tiles.fairness.tile.UnzipPairFstTile
   soda.tiles.fairness.tile.UnzipPairSndTile
   soda.tiles.fairness.tile.UnzipTripleFstTile
   soda.tiles.fairness.tile.UnzipTripleSndTile
   soda.tiles.fairness.tile.UnzipTripleTrdTile
-  soda.tiles.fairness.tile.WithPTile
   soda.tiles.fairness.tile.ZipTile
   soda.tiles.fairness.pipeline.EqualityPipeline
   soda.tiles.fairness.pipeline.EquityPipeline

diff --git a/examples/src/test/scala/soda/tiles/fairness/example/childcaresubsidy/Package.scala b/examples/src/test/scala/soda/tiles/fairness/example/childcaresubsidy/Package.scala
@@ -30,14 +30,12 @@ import   soda.tiles.fairness.tile.MapPTile
 import   soda.tiles.fairness.tile.NeededPTile
 import   soda.tiles.fairness.tile.PredictionPTile
 import   soda.tiles.fairness.tile.ReceivedSigmaPTile
-import   soda.tiles.fairness.tile.ResultPTile
 import   soda.tiles.fairness.tile.SigmaTile
 import   soda.tiles.fairness.tile.UnzipPairFstTile
 import   soda.tiles.fairness.tile.UnzipPairSndTile
 import   soda.tiles.fairness.tile.UnzipTripleFstTile
 import   soda.tiles.fairness.tile.UnzipTripleSndTile
 import   soda.tiles.fairness.tile.UnzipTripleTrdTile
-import   soda.tiles.fairness.tile.WithPTile
 import   soda.tiles.fairness.tile.ZipTile
 import   soda.tiles.fairness.pipeline.EqualityPipeline
 import   soda.tiles.fairness.pipeline.EquityPipeline

diff --git a/examples/src/test/scala/soda/tiles/fairness/example/childcaresubsidy/Package.soda b/examples/src/test/scala/soda/tiles/fairness/example/childcaresubsidy/Package.soda
@@ -31,14 +31,12 @@ import
   soda.tiles.fairness.tile.NeededPTile
   soda.tiles.fairness.tile.PredictionPTile
   soda.tiles.fairness.tile.ReceivedSigmaPTile
-  soda.tiles.fairness.tile.ResultPTile
   soda.tiles.fairness.tile.SigmaTile
   soda.tiles.fairness.tile.UnzipPairFstTile
   soda.tiles.fairness.tile.UnzipPairSndTile
   soda.tiles.fairness.tile.UnzipTripleFstTile
   soda.tiles.fairness.tile.UnzipTripleSndTile
   soda.tiles.fairness.tile.UnzipTripleTrdTile
-  soda.tiles.fairness.tile.WithPTile
   soda.tiles.fairness.tile.ZipTile
   soda.tiles.fairness.pipeline.EqualityPipeline
   soda.tiles.fairness.pipeline.EquityPipeline