Commit 6500519d authored by Dorinela Dascalu's avatar Dorinela Dascalu 🌺

Merge branch 'master' into sentimentAnalysis_Florea

# Conflicts:
#	pom.xml
#	src/main/java/data/AbstractDocument.java
#	src/main/java/runtime/cscl/CreativityTest.java
#	src/main/java/services/discourse/dialogism/DialogismComputations.java
#	src/main/java/services/nlp/parsing/Parsing.java
#	src/main/java/view/widgets/ReaderBenchView.java
#	src/main/java/view/widgets/cscl/ChatView.java
#	src/main/java/view/widgets/cscl/ChatVoiceInterAnimationView.java
#	src/main/java/view/widgets/cscl/CollaborationVoiceView.java
#	src/main/java/view/widgets/cscl/VoiceSynergyView.java
#	src/main/java/view/widgets/document/SentenceLevelInterAnimationView.java
parent 13defd49
......@@ -13,6 +13,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/scala" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/config" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
......@@ -335,7 +336,6 @@
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.1" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: com.github.scopt:scopt_2.10:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.10.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.mahout:mahout-spark_2.10:0.12.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.spark:spark-core_2.10:1.5.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro-mapred:hadoop2:1.7.7" level="project" />
......@@ -403,11 +403,6 @@
<orderEntry type="library" name="Maven: net.jpountz.lz4:lz4:1.3.0" level="project" />
<orderEntry type="library" name="Maven: org.roaringbitmap:RoaringBitmap:0.4.5" level="project" />
<orderEntry type="library" name="Maven: commons-net:commons-net:2.2" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-remote_2.10:2.3.11" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-actor_2.10:2.3.11" level="project" />
<orderEntry type="library" name="Maven: com.typesafe:config:1.2.1" level="project" />
<orderEntry type="library" name="Maven: org.uncommons.maths:uncommons-maths:1.2.2a" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-slf4j_2.10:2.3.11" level="project" />
<orderEntry type="library" name="Maven: org.json4s:json4s-jackson_2.10:3.2.10" level="project" />
<orderEntry type="library" name="Maven: org.json4s:json4s-core_2.10:3.2.10" level="project" />
<orderEntry type="library" name="Maven: org.json4s:json4s-ast_2.10:3.2.10" level="project" />
......@@ -495,7 +490,6 @@
<orderEntry type="library" name="Maven: org.elasticsearch:jna:4.4.0" level="project" />
<orderEntry type="library" name="Maven: org.elasticsearch.client:transport:5.4.0" level="project" />
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:transport-netty3-client:5.4.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty:3.10.6.Final" level="project" />
<orderEntry type="library" name="Maven: org.elasticsearch.plugin:transport-netty4-client:5.4.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.9.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.9.Final" level="project" />
......@@ -522,6 +516,27 @@
<orderEntry type="library" name="Maven: com.github.wendykierp:JTransforms:with-dependencies:3.1" level="project" />
<orderEntry type="library" name="Maven: pl.edu.icm:JLargeArrays:1.5" level="project" />
<orderEntry type="library" name="Maven: com.readerbench:rosuda.JRI:0.8" level="project" />
<orderEntry type="library" name="Maven: com.readerbench:solr:1.0.6" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-actor_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.10.4" level="project" />
<orderEntry type="library" name="Maven: com.typesafe:config:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-remote_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty:3.8.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.uncommons.maths:uncommons-maths:1.2.2a" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-contrib_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-cluster_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-persistence-experimental_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: org.iq80.leveldb:leveldb:0.5" level="project" />
<orderEntry type="library" name="Maven: org.iq80.leveldb:leveldb-api:0.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.7" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni:1.7" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.hawtjni:hawtjni-runtime:1.8" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-osx:1.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux32:1.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-linux64:1.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win32:1.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-win64:1.5" level="project" />
<orderEntry type="library" name="Maven: com.typesafe.akka:akka-slf4j_2.10:2.3.5" level="project" />
<orderEntry type="library" name="Maven: edu.stanford.nlp:stanford-corenlp:models-english:3.8.0" level="project" />
<orderEntry type="library" name="Maven: edu.stanford.nlp:stanford-corenlp:models-french:3.8.0" level="project" />
<orderEntry type="library" name="Maven: edu.stanford.nlp:stanford-corenlp:models-spanish:3.8.0" level="project" />
......
......@@ -40,7 +40,7 @@
<id>netbeans</id>
<url>http://bits.netbeans.org/maven2/</url>
</repository>
</repositories>
</repositories>
<build>
<pluginManagement>
<plugins>
......@@ -112,20 +112,6 @@
</executions>
</plugin>
</plugins>
<resources>
<!-- config file -->
<resource>
<directory>src/main/config</directory>
</resource>
<!-- Java resources -->
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -157,6 +143,9 @@
<apache.httpcomponents.httpcore.version>4.4.7</apache.httpcomponents.httpcore.version>
<apache.httpcomponents.httpclient.version>4.5.3</apache.httpcomponents.httpclient.version>
<akka.scala.version>2.10</akka.scala.version>
<akka.version>2.3.5</akka.version>
<hibernate.version>5.2.6.Final</hibernate.version>
<sqlite.version>3.8.11.2</sqlite.version>
<simple.xml.version>2.7.1</simple.xml.version>
......@@ -557,5 +546,93 @@
<artifactId>solr-solrj</artifactId>
<version>${solrj.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>5.4.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>5.4.0</version>
</dependency>
<!-- Ths -->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${lucene-core.vesrion}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j-core.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty-all.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.10.0</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.13</version>
</dependency>
<dependency>
<groupId>net.sf.jazzy</groupId>
<artifactId>jazzy-core</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>com.github.wendykierp</groupId>
<artifactId>JTransforms</artifactId>
<version>3.1</version>
<classifier>with-dependencies</classifier>
</dependency>
<dependency>
<groupId>com.readerbench</groupId>
<artifactId>rosuda.JRI</artifactId>
<version>${rosuda.JRI.version}</version>
</dependency>
<!-- SolrReaderBench -->
<dependency>
<groupId>com.readerbench</groupId>
<artifactId>solr</artifactId>
<version>1.0.6</version>
</dependency>
<!-- BEGIN akka dependency -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor_${akka.scala.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-remote_${akka.scala.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-contrib_${akka.scala.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-slf4j_${akka.scala.version}</artifactId>
<version>${akka.version}</version>
</dependency>
<!-- BEGIN akka dependency -->
</dependencies>
</project>
......@@ -39,7 +39,7 @@ public class ConversationProcessing {
data.cscl.Conversation c = new data.cscl.Conversation(models, lang).loadConversation(message.getConversation(), models, lang, usePOSTagging);
c.setPath(message.getPath());
LOGGER.info("Start computeAll ... ");
c.computeAll(computeDialogism);
c.computeAll(computeDialogism, false);
return c;
}
......
......@@ -37,10 +37,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import com.readerbench.solr.entities.cscl.Contribution;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import data.AbstractDocument;
import data.AbstractDocumentTemplate;
import data.AbstractDocumentTemplate.BlockTemplate;
......
......@@ -162,6 +162,9 @@ public class ReaderBenchServer {
private static List<AbstractDocument> loadedDocs;
private static String loadedPath;
private ElasticsearchService elasticsearchService = new ElasticsearchService();
private static SolrService SOLR_SERVICE = new SolrService("http://141.85.232.56:8983/solr/", "community", 100);
private static SolrService SOLR_SERVICE_COMMUNITY = new SolrService("http://141.85.232.56:8983/solr/", "online_community", 100);
private static QueryResult errorEmptyBody() {
return new QueryResult(false, ParamsValidator.errorNoParams());
......@@ -291,10 +294,6 @@ public class ReaderBenchServer {
server.start();
}
private static SolrService SOLR_SERVICE = new SolrService("http://141.85.232.56:8983/solr/", "community", 100);
private static SolrService SOLR_SERVICE_COMMUNITY = new SolrService("http://141.85.232.56:8983/solr/", "online_community", 100);
private ElasticsearchService elasticsearchService = new ElasticsearchService();
public List<ResultCategory> generateCategories(AbstractDocument document, Lang lang, List<ISemanticModel> models, Boolean usePosTagging, Boolean computeDialogism, Boolean useBigrams) throws Exception {
List<ResultCategory> resultCategories = new ArrayList<>();
List<Category> dbCategories = CategoryDAO.getInstance().findAll();
......@@ -1688,7 +1687,7 @@ public class ReaderBenchServer {
0, 7);
community.computeMetrics(useTextualComplexity, true, true);
JSONArray participantsCommunities = community.generateParticipantViewSubCommunities(communityFolder.toString());
JSONArray participantsCommunities = community.generateParticipantViewSubCommunities(communityFolder.toString(), 1);
QueryResultCommunityParticipants queryResult = new QueryResultCommunityParticipants();
queryResult.setParticipants(participantsCommunities);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment