Skip to content

fix(ENGKNOW-2570): Fix granno and where. #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gmagnu merged 1 commit into from
Jul 22, 2025
Merged

fix(ENGKNOW-2570): Fix granno and where. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions gortools/src/main/scala/gorsat/Analysis/GrannoAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ object GrannoAnalysis {
def process(r: Row, BA: BinAggregator): Unit = {
val chr = r.chr
val binID = binIDgen.ID(1)
val sta : Int = 0
var sto : Int = 1000000000
try {
val (sta, sto) = (0, session.getProjectContext.getReferenceBuild.getBuildSize.get(r.chr))
BA.update(r, binID, chr, sta, sto)
sto = session.getProjectContext.getReferenceBuild.getBuildSize.get(r.chr)
} catch {
case _: Exception =>
val (sta, sto) = (0, 1000000000)
BA.update(r, binID, chr, sta, sto)
case _: Exception => // Ignore, use default value
}

BA.update(r, binID, chr, sta, sto)
} // One ouput row per input row
}

Expand Down
2 changes: 1 addition & 1 deletion gortools/src/main/scala/gorsat/Analysis/WhereAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ case class WhereAnalysis(context: GorContext, executeNor: Boolean, paramString:
}

override def process(r: Row): Unit = {
if (!isFilterValid || filter.evalBooleanFunction(r)) {
if ((isFilterValid && filter.evalBooleanFunction(r)) || (!isFilterValid && ignoreFilterError)) {
// Row is passed if the filter is invalid (TRYWHERE) or if the filter evaluates to true
statsInc("rows passed through filter")
super.process(r)
Expand Down
Loading