Skip to content
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
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Conversation

GravityDrowned
Copy link

fork contains work done on ISFA in order to make it usable again

  • fixes to the folder structure
  • updates to the build.sbt file
  • and setting ISFA up to play nice with a local sagemath tcp socket
  • some debugging work on GeneratingFunctionsSearch.scala

@ja-albert
Copy link

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
+}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants