Skip to content

squash some commits into one + add version tags #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.

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

Open
omueller54 wants to merge 36 commits into
base: master
Choose a base branch
from
Open

squash some commits into one + add version tags #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3a546a4
Version 0.94 - extended by tagging of filerefs and externalresourcere…
rghsh Jul 14, 2014
1a8c22f
Rename submission to submission-restrictions
csware Aug 27, 2014
54e0a70
Whitespace cleanup
csware Aug 27, 2014
97b4fc7
Extend model-solution to link to file and allow to consist of multipl…
csware Aug 27, 2014
2f58967
Make sure each indention level consists of 4 spaces
csware Aug 27, 2014
ba1babc
Fix indention and spaces
csware Sep 3, 2014
46b857f
Add missing prefixes
csware Sep 12, 2014
404fae5
Make filename in file tag optional
csware Sep 22, 2014
fde34d6
Allow only one top element
csware Nov 17, 2014
bca88c9
adding proforma-unittest.xsd
t001 Jan 31, 2015
cf66b43
Rename workingdata to inputdata
csware Feb 18, 2015
943bc7c
Fix targetNamespace for unittests
csware Mar 1, 2015
f6e507c
Add an example task export
csware Mar 1, 2015
d0486c6
Document internal-library
csware Mar 2, 2015
35ad6be
Drop tags as these are system-specific metadata
csware Jan 29, 2015
18d6471
Update whitepaper.md
t001 Mar 4, 2015
b60074f
Update whitepaper.md
t001 Mar 4, 2015
c37dfb4
Update whitepaper.md
t001 Mar 4, 2015
66902c2
Update whitepaper.md
t001 Mar 4, 2015
6527098
Update whitepaper.md
t001 Mar 4, 2015
b3cc7fc
minor correction in whitepaper
rghsh Mar 14, 2015
a49a96e
added submission-restrictions
Mar 9, 2015
669662e
version to v1.0.0
Mar 10, 2015
0f40b5e
updated example.xml with new submission-restrictions
Mar 12, 2015
0c5f89d
Update whitepaper.md
nino2205 Mar 16, 2015
a05444e
Update whitepaper.md
nino2205 Mar 16, 2015
606e699
fixed "keyref out of scope"
Jun 11, 2015
7d013f3
Create proforma-jartest.xsd
upriss Oct 1, 2015
da39dec
add regexptest xsd
omueller54 May 17, 2016
3ad9474
delete unnecessary minInclusive
omueller54 Jul 12, 2016
7277950
modify regexp element + add some comments
omueller54 Jul 16, 2016
a1b25d5
Move timeout to test-configuration
csware Aug 3, 2016
2574a1c
Rename main-class to entry-point
csware Aug 3, 2016
a678d8a
Fix inconsistencies in submission-frestrictions
Aug 31, 2016
8167d20
Minor cleanup
csware Aug 31, 2016
3cbe967
Headers in Markdown are not being rendered
rghsh Apr 25, 2017
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
65 changes: 65 additions & 0 deletions example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<p:task xmlns:p="urn:proforma:task:v1.0.1" lang="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:proforma:task:v1.0.1 taskxml.xsd"
uuid="66217f7d-ca8e-4666-a6f8-934c79c24206" parent-uuid=""
>

<p:description>Calculate the n-th Fibonacci number. As a reminder: The first two Fibonacci numbers are 0 and 1. The following numbers are the sum of the previous two numbers (0, 1, 1, 2, 3, 5, 8, 13, 21...). The class should be named Fibonacci and the method to be written fibonacci has an int as an input parameter.</p:description>
<p:proglang version="1.4">java</p:proglang>
<p:submission-restrictions>
<p:files-restriction>
<p:required filename="Fibonacci.java"/>
</p:files-restriction>
</p:submission-restrictions>
<p:files>
<p:file class="internal" filename="FibonacciTest.java" id="f1">
import junit.framework.TestCase;
public class FibonacciTest extends TestCase {
public void testPos() {
assertEquals(13, Fibonacci.fibonacci(7));
}
public void testNull() {
assertEquals(0, Fibonacci.fibonacci(0));
}
}
</p:file>
<p:file class="internal" filename="Fibonacci.java" id="f2">
public class Fibonacci {
public int fibonacci(int i) {
if (i &lt;= 0) return 0;
else if (i == 1) return 1;
return fibonacci(i - 2) + fibonacci(i - 1);
}
}
</p:file>
</p:files>
<p:model-solutions>
<p:model-solution id="m1">
<p:filerefs>
<p:fileref refid="f2"/>
</p:filerefs>
</p:model-solution>
</p:model-solutions>
<p:tests>
<p:test id="t1">
<p:title>Compilation test</p:title>
<p:test-type>java-compilation</p:test-type>
<p:test-configuration/>
</p:test>
<p:test id="t2">
<p:title>Calculation test</p:title>
<p:test-type>unittest</p:test-type>
<p:test-configuration xmlns:u="urn:proforma:tests:unittest:v1" xsi:schemaLocation="urn:proforma:tests:unittest:v1 proforma-unittest.xsd">
<p:filerefs>
<p:fileref refid="f1"/>
</p:filerefs>
<u:unittest framework="JUnit" version="3">
<u:main-class>FibonacciTest</u:main-class>
</u:unittest>
</p:test-configuration>
</p:test>
</p:tests>
<p:meta-data>
<p:title>Calculation of n-th Fibonacci number</p:title>
</p:meta-data>
</p:task>
12 changes: 12 additions & 0 deletions proforma-jartest.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:proforma:tests:jartest:v1" targetNamespace="urn:proforma:tests:jartest:v1" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:element name="jartest">
<xs:complexType>
<xs:sequence>
<xs:element name="parameter" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="framework" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
</xs:schema>
44 changes: 44 additions & 0 deletions proforma-regexptest.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:proforma:tests:regexptest:v0.9"
targetNamespace="urn:proforma:tests:regexptest:v0.9" elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:element name="regexptest">
<xs:complexType>
<xs:sequence>
<!-- entry-point is a file or a main-class needed to start a program -->
<xs:element name="entry-point" type="xs:string"/>
<!-- parameter: optional list of command line arguments -->
<xs:element name="parameter" minOccurs="0">
<xs:simpleType>
<xs:list itemType="xs:string"/>
</xs:simpleType>
</xs:element>
<xs:element name="regular-expressions">
<xs:complexType>
<!-- choice means: regexp-allow OR regexp-disallow -->
<xs:choice>
<xs:sequence>
<!-- regular expression for allowed program outputs -->
<xs:element name="regexp-allow" type="ns1:regexpType" maxOccurs="unbounded"/>
<!-- regular expression for not allowed program outputs -->
<xs:element name="regexp-disallow" type="ns1:regexpType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:element name="regexp-disallow" type="ns1:regexpType" maxOccurs="unbounded"/>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

<xs:complexType name="regexpType">
<xs:attributeGroup ref="ns1:regexp-flags"/>
</xs:complexType>
<!-- attributes to define, which regexp-flags are applied to a specified regular expression -->
<xs:attributeGroup name="regexp-flags">
<xs:attribute name="case-insensitive" type="xs:boolean" default="false"/>
<xs:attribute name="dotall" type="xs:boolean" default="false"/>
<xs:attribute name="multiline" type="xs:boolean" default="false"/>
<xs:attribute name="free-spacing" type="xs:boolean" default="false"/>
</xs:attributeGroup>
</xs:schema>
12 changes: 12 additions & 0 deletions proforma-unittest.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:proforma:tests:unittest:v1" targetNamespace="urn:proforma:tests:unittest:v1.1" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:element name="unittest">
<xs:complexType>
<xs:sequence>
<xs:element name="entry-point" type="xs:string" minOccurs="1"/>
</xs:sequence>
<xs:attribute name="framework" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>
</xs:schema>
Loading