-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added support for deactivated...started support for sh:message
- Loading branch information
Showing
19 changed files
with
523 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
modules/converter/src/main/scala/es/weso/shex/converter/CountUsages.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package es.weso.shex.converter | ||
| import cats._ | ||
| import cats.data._ | ||
| import cats.implicits._ | ||
| import es.weso.shex._ | ||
|
|
||
| object CountUsages { | ||
|
|
||
| def countUsages(schema: Schema): Either[String, Map[ShapeLabel,Int]] = { | ||
| val (visited,eitherUsages) = countUsagesSchema.value.run(iniitialVisited).run(schema) | ||
| eitherUsages | ||
| } | ||
|
|
||
| private lazy val iniitialVisited: Visited = Set() | ||
| type Visited = Set[ShapeLabel] | ||
| type SchemaReader[A] = ReaderT[Id,Schema,A] | ||
| type S[A] = StateT[SchemaReader,Visited,A] | ||
| type Err = String | ||
| type Result[A] = EitherT[S,Err,A] | ||
|
|
||
| private def ok[A](x: A): Result[A] = EitherT.pure[S,Err](x) // StateT[SchemaReader,Visited,A].pure(x) | ||
| private def err[A](str: String): Result[A] = EitherT.leftT[S,A](str) | ||
| private def getVisited: Result[Visited] = EitherT.liftF[S,Err,Visited](StateT.get[SchemaReader,Visited]) | ||
| private def modifyVisited(fn: Visited => Visited): Result[Unit] = EitherT.liftF[S,Err,Unit](StateT.modify[SchemaReader,Visited](fn)) | ||
| private def addVisited(lbl: ShapeLabel):Result[Unit] = | ||
| modifyVisited(visited => visited + lbl) | ||
| private def getSchema: Result[Schema] = EitherT.liftF[S,Err,Schema](StateT.liftF[SchemaReader,Visited,Schema](Kleisli.ask)) | ||
| private def sequence[A](ls: List[Result[A]]): Result[List[A]] = ls.sequence[Result,A] | ||
| private def getShape(lbl: ShapeLabel): Result[ShapeExpr] = for { | ||
| schema <- getSchema | ||
| se <- schema.getShape(lbl). | ||
| fold(err[ShapeExpr](s"Not found shape with label $lbl"))(ok(_)) | ||
| } yield se | ||
|
|
||
| private def isBNode(lbl: ShapeLabel): Boolean = lbl match { | ||
| case _: BNodeLabel => true | ||
| case _ => false | ||
| } | ||
|
|
||
| private def tripleExprBNodeLabels(schema: Schema): List[ShapeLabel] = | ||
| schema.tripleExprMap.getOrElse(Map()).keys.toList.filter(isBNode(_)) | ||
|
|
||
| private def countUsagesSchema: Result[Map[ShapeLabel,Int]] = for { | ||
| schema <- getSchema | ||
| usages <- sequence(tripleExprBNodeLabels(schema).map(countUsagesLabel(_))) | ||
| } yield usages.toMap | ||
|
|
||
| private def countUsagesLabel(lbl: ShapeLabel): Result[(ShapeLabel, Int)] = { | ||
| def zero = ok(0) | ||
| def comb(r: Result[Int], se: ShapeExpr): Result[Int] = for { | ||
| c <- countUsagesLabelShapeExpr(lbl,se) | ||
| n <- r | ||
| } yield n + c | ||
| for { | ||
| schema <- getSchema | ||
| count <- schema.shapeList.foldLeft(zero)(comb) | ||
| } yield { | ||
| (lbl, count) | ||
| } | ||
| } | ||
|
|
||
| private def countUsagesLabelShapeExpr(lbl: ShapeLabel, se: ShapeExpr): Result[Int] = | ||
| se match { | ||
| case ShapeAnd(_, ses) => sequence(ses.map(countUsagesLabelShapeExpr(lbl,_))).map(_.sum) | ||
| case ShapeOr(_,ses) => sequence(ses.map(countUsagesLabelShapeExpr(lbl,_))).map(_.sum) | ||
| case ShapeNot(_,se) => countUsagesLabelShapeExpr(lbl,se) | ||
| case nk: NodeConstraint => ok(0) | ||
| case s: Shape => s.expression.fold(ok(0))(countUsagesLabelTripleExpr(lbl,_)) | ||
| case ShapeExternal(_) => ok(0) | ||
| case ShapeRef(lbl) => for { | ||
| visited <- getVisited | ||
| n <- if (visited contains lbl) ok(0) | ||
| else for { | ||
| _ <- addVisited(lbl) | ||
| shape <- getShape(lbl) | ||
| n <- countUsagesLabelShapeExpr(lbl,shape) | ||
| } yield n | ||
| } yield n | ||
| } | ||
|
|
||
| private def countUsagesLabelTripleExpr(lbl: ShapeLabel, te: TripleExpr): Result[Int] = | ||
| te match { | ||
| case e: EachOf => sequence(e.expressions.map(countUsagesLabelTripleExpr(lbl,_))).map(_.sum) | ||
| case e: OneOf => sequence(e.expressions.map(countUsagesLabelTripleExpr(lbl,_))).map(_.sum) | ||
| case Inclusion(includeLbl) => | ||
| if (lbl == includeLbl) ok(1) | ||
| else ok(0) | ||
| case e: Expr => ok(0) | ||
| case tc: TripleConstraint => tc.valueExpr.fold(ok(0))(countUsagesLabelShapeExpr(lbl,_)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
modules/converter/src/main/scala/es/weso/shex/converter/ShExSimplifier.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package es.weso.shex.converter | ||
|
|
||
| import es.weso.shex._ | ||
| import cats._ | ||
| import cats.implicits._ | ||
|
|
||
| trait ShExSimplifier { | ||
| def inlineInclusions(schema: Schema): Either[String,Schema] = { | ||
| for { | ||
| usages <- CountUsages.countUsages(schema) | ||
| inlined <- inlineInclusionLabels(usages.toList.collect { case (lbl,c) if c == 1 => lbl}, schema) | ||
| } yield { | ||
| inlined | ||
| } | ||
| } | ||
|
|
||
| def inlineInclusionLabels(ls: List[ShapeLabel], schema: Schema): Either[String, Schema] = { | ||
| val zero: Either[String, Schema] = Right(schema) | ||
| ls.foldLeft(zero)(inlineInclusion) | ||
| } | ||
|
|
||
| def inlineInclusion(r: Either[String,Schema], lbl: ShapeLabel): Either[String, Schema] = for { | ||
| currentSchema <- r | ||
| next <- inline(currentSchema, lbl) | ||
| } yield next | ||
|
|
||
| def inline(schema: Schema, lbl: ShapeLabel): Either[String, Schema] = for { | ||
| te <- schema.getTripleExprMap.get(lbl).toRight(s"Error obtaining label $lbl in map: ${schema.getTripleExprMap()}") | ||
| } yield ??? | ||
|
|
||
| } |
Oops, something went wrong.