-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Updating ISFA #11
Open
GravityDrowned
wants to merge
13
commits into
MathHubInfo:master
Choose a base branch
from
GravityDrowned:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Updating ISFA #11
Conversation
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
…r.scala runs again. Currently working on making SageWrapper.scala+ GeneratingFunctionsSagePackage.scala run again
…gh SageWrapper.scala (and trimming the duplicate code).
…python tcp socket. Tried to understand how GeneratingFunctionSearch.scala works
…ichael Wagners Sage Math python server
I also needed the following additional patches: diff --git a/logs/.gitignore b/logs/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/logs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/src/main/scala/parser/DocumentParser.scala b/src/main/scala/parser/DocumentParser.scala
index 74af92a..5d4ea79 100644
--- a/src/main/scala/parser/DocumentParser.scala
+++ b/src/main/scala/parser/DocumentParser.scala
@@ -96,7 +96,7 @@ object RelationDao extends ModelCompanion[RelationRepString, ObjectId] {
object DocumentParser {
- val dictionary = Source.fromFile(getClass.getResource("/dictionary").getPath).getLines().toSet
+ val dictionary = Source.fromFile("src/main/resources/dictionary").getLines().toSet
private val IDregex = "A\\d+".r
diff --git a/src/main/scala/parser/FormulaParser.scala b/src/main/scala/parser/FormulaParser.scala
index 3afca8e..30ce29e 100644
--- a/src/main/scala/parser/FormulaParser.scala
+++ b/src/main/scala/parser/FormulaParser.scala
@@ -117,7 +117,7 @@ class FormulaParser extends JavaTokenParsers with PackratParsers {
res
}
- val dictionary = Source.fromFile(getClass.getResource("/dictionary").getPath).getLines().map(_.trim).toSet
+ val dictionary = Source.fromFile("src/main/resources/dictionary").getLines().map(_.trim).toSet
// This creates logic or for e.g. "n-th | x-th"
val exceptionCases: Regex = List("[A-Za-z]\\-th").mkString("|").r
@@ -746,4 +746,4 @@ object FormulaParserInst extends FormulaParser {
// TheoryRepDao.findOneByTheory(564).foreach(_.generatingFunctions.foreach(x => println(x.toSage)))
}
-}
\ No newline at end of file
+}
|
This was referenced Nov 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fork contains work done on ISFA in order to make it usable again