Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged conflicts with master

  • Loading branch information...
commit 6e50ce2318cc9b1307cadfa02fefc5a13146ef80 2 parents 66ba04f + ecced00
@genzoo genzoo authored
View
2  .gitignore
@@ -4,3 +4,5 @@
/*.log
/src_gen
/classes-devel
+/*.log
+/.idea
View
4 README.rdoc
@@ -11,11 +11,11 @@ In order to generate the Geograph Agent Farm domain model do the following:
1. Clone the project from the git repository:
git clone git://github.com/algorithmica/geograph-agent-farm-domain.git
2. Generate the domain model using the following comand (you can find the dml in src/common/dml/geograph-agent-farm.dml):
- ant -f build_ff.xml compile
+ ant -f build_ispn.xml compile
3. Enter in the geograph-agent-farm-domain folder using a shell and compile the project with ant:
ant compile
4. Package the domain model:
ant gen-jar
5. Run the Jruby test:
- jruby -S jruby_test.rb
+ jruby -S jruby_ispn_test.rb
6. Put the new domain model inside the Geograph Agent Farm folder lib/cloud_tm/jars and the dml inside lib/fenix/conf
View
1  build.xml
@@ -71,6 +71,7 @@
nbproject/build-impl.xml file.
-->
+
<target name="gen-jar" depends="compile">
<jar destfile="${dist.jar}" basedir="classes"/>
</target>
View
BIN  dist/geograph-agent-farm-domain.jar
Binary file not shown
View
2  src/common/dml/geograph-agent-farm.dml
@@ -31,7 +31,7 @@ class AgentGroup {
class Agent {
String status;
- Long geo_object;
+ String geo_object;
String perception_status;
Decimal latitude;
Decimal longitude;
Please sign in to comment.
Something went wrong with that request. Please try again.