[Ruler-commits] r39 - in pkg: . ruleR ruleR/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 21 09:48:51 CEST 2012
Author: merysionek
Date: 2012-08-21 09:48:50 +0200 (Tue, 21 Aug 2012)
New Revision: 39
Removed:
pkg/.RData
pkg/.Rhistory
pkg/Double2Single.R
pkg/New.R
pkg/matrices.R
pkg/proba11.R
pkg/proba12.R
pkg/ruleR/.Rd2pdf2384/
pkg/ruleR/.Rd2pdf2544/
pkg/ruleR/.Rd2pdf2920/
pkg/ruleR/.Rd2pdf3212/
pkg/ruleR/.Rd2pdf4040/
pkg/ruleR/NAMESPACE
pkg/ruleR/Read-and-delete-me
pkg/ruleR/man/.Rd2pdf2296/
pkg/ruleR/man/.Rd2pdf3052/
pkg/ruleR/man/.Rd2pdf4676/
pkg/ruleR/man/.Rd2pdf5040/
Log:
cleaning up
Deleted: pkg/.RData
===================================================================
(Binary files differ)
Deleted: pkg/.Rhistory
===================================================================
--- pkg/.Rhistory 2012-08-21 07:47:23 UTC (rev 38)
+++ pkg/.Rhistory 2012-08-21 07:48:50 UTC (rev 39)
@@ -1,512 +0,0 @@
-function(x,y,z){
-return(y*z)
-})
-#EXECUTING RULES OPERATING ON TWO ARGUMENTS
-setMethod("wyliczDouble",signature(x="DoubleRule", y="numeric", z="numeric"),
-function(x, y, z){
-firstArg <- y
-secondArg <-z
-if(!is.null(x at firstRule)){
-firstArg <- wylicz(x at firstRule,firstArg)
-}
-if(!is.null(x at secondRule)){
-secondArg <- wylicz(x at secondRule,secondArg)
-}
-return(wyliczDoubleSpecific(x,firstArg, secondArg))
-})
-##--------------------------test--------------------------------------------------------------
-p<-new("AddConstSingleRule", constantVal=6)
-q<-new("MultConstSingleRule", constantVal=10, previousRule=p)
-inherits(p,"SingleRule")
-inherits(q,"SingleRule")
-wylicz(p,4)
-wylicz(q,4)
-r<-new("AddDoubleRule")
-inherits(r,"DoubleRule")
-wyliczDouble(r,3,2)
-s<-new("MultDoubleRule", firstRule=p)
-wyliczDouble(s,2,2)
-# tu masz podwó jne reguły też
-# pobaw się i zobacz czy rozumiesz
-wyliczDouble <- function(x,y,z){stop ("No function to execute this.")} #throw a mistake
-setMethod("wyliczDouble",signature(x="DoubleRule", y="numeric", z="numeric"),
-function(x, y, z){
-firstArg <- y
-secondArg <-z
-if(!is.null(x at firstRule)){
-firstArg <- wylicz(x at firstRule,firstArg)
-}
-if(!is.null(x at secondRule)){
-secondArg <- wylicz(x at secondRule,secondArg)
-}
-return(wyliczDoubleSpecific(x,firstArg, secondArg))
-})
-p<-new("AddConstSingleRule", constantVal=6)
-q<-new("MultConstSingleRule", constantVal=10, previousRule=p)
-wylicz(p,4)
-wylicz(p,55)
-q<-new("MultConstSingleRule", constantVal=10, previousRule=p)
-wylicz(q)
-wylicz(q,9)
-wylicz(q,4)
-r<-new("AddDoubleRule")
-wyliczDouble(r,3,2)
-wyliczDouble(s,2,2)
-wyliczDouble(r,3,2)# 3+2=5
-##------------------------------SingleRules-------------------------------------------------
-#VIRTUAL CLASS FOR RULESOPERATING ON SINGLE ARGUMENTS
-setClass("SingleRule",
-representation = representation(previousRule="SingleRule"),
-S3methods=TRUE)
-calculateSpecific <- function(x,y){
-return(y)
-}
-setMethod("calculateSpecific",signature(x="SingleRule", y="numeric"),
-function(x,y){
-return(y)
-})
-#[1] RULE 1 - ADDING A CONSTANT
-setClass("AddConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="AddConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal+y)
-})
-#[2] RULE 2 - MULTIPLYING BY A CONSTANT
-setClass("MultConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="MultConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal*y)
-})
-#EXECUTING RULES REFERING TO SINGLE ARGUMENT
-calculate <- function(x,y){
-return(y)
-}
-setMethod("calculate",signature(x="SingleRule", y="numeric"), #both [1] and [2] inherit from class 'SingleRule'
-function(x, y){
-result<-y
-if(!is.null(x at previousRule)){ # if there are some rules nested inside 'x'
-result <- calculate(x at previousRule,result)
-}
-return(calculateSpecific(x,result)) # if there are no more nested functions, execute
-})
-##------------------------------------------------DoubleRules-------------------------------
-#VIRTUAL CLASS FOR RULES OPERATING ON TWO ARGUMENTS
-setClass("DoubleRule", representation = representation(firstRule="SingleRule", secondRule="SingleRule"),
-S3methods=TRUE)
-calculateDoubleSpecific <- function(x,y,z){stop ("No method to calculate it.")} #throw a mistake
-#[1] ADD TWO PREVIOUS EXPRESSIONS
-setClass("AddDoubleRule", contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateDoubleSpecific",signature(x="AddDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y+z)
-})
-#[2] MULTIPLY TWO PREVIOUS EXPRESSIONS
-setClass("MultDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateDoubleSpecific",signature(x="MultDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y*z)
-})
-#EXECUTING RULES OPERATING ON TWO ARGUMENTS
-calculateDouble <- function(x,y,z){stop ("No function to execute this.")} #throw a mistake
-setMethod("calculateDouble",signature(x="DoubleRule", y="numeric", z="numeric"),
-function(x, y, z){
-firstArg <- y #first element of the sequence
-secondArg <-z #second element of the sequence
-if(!is.null(x at firstRule)){ #if there are some rules nested inside
-firstArg <- calculate(x at firstRule,firstArg) #execute first single-argument rule
-}
-if(!is.null(x at secondRule)){
-secondArg <- calculate(x at secondRule,secondArg) #execute second single-argument rule
-}
-return(calculateDoubleSpecific(x,firstArg, secondArg)) #if there are no more nested rules, execute
-})
-##--------------------------test--------------------------------------------------------------
-p<-new("AddConstSingleRule", constantVal=6)
-q<-new("MultConstSingleRule", constantVal=10, previousRule=p)
-calculate(p,4)# 4+6=10
-calculate(q,4)# (4+6)*10=100
-s<-new("MultDoubleRule", firstRule=p)
-r<-new("AddDoubleRule")
-calculateDouble(s,2,2)# (2+6)*2=16
-calculateDouble(r,3,2)# 3+2=5
-##------------------------------SingleRules-------------------------------------------------
-#VIRTUAL CLASS FOR RULESOPERATING ON SINGLE ARGUMENTS
-setClass("SingleRule",
-representation = representation(previousRule="SingleRule"),
-S3methods=TRUE)
-calculateSpecific <- function(x,y){
-return(y)
-}
-setMethod("calculateSpecific",signature(x="SingleRule", y="numeric"),
-function(x,y){
-return(y)
-})
-#[1] RULE 1 - ADDING A CONSTANT
-setClass("AddConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="AddConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal+y)
-})
-#[2] RULE 2 - MULTIPLYING BY A CONSTANT
-setClass("MultConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="MultConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal*y)
-})
-#EXECUTING RULES REFERING TO SINGLE ARGUMENT
-calculate <- function(x,y){
-return(y)
-}
-setMethod("calculate",signature(x="SingleRule", y="numeric"), #both [1] and [2] inherit from class 'SingleRule'
-function(x, y){
-result<-y
-if(!is.null(x at previousRule)){ # if there are some rules nested inside 'x'
-result <- calculate(x at previousRule,result)
-}
-return(calculateSpecific(x,result)) # if there are no more nested functions, execute
-})
-##------------------------------------------------DoubleRules-------------------------------
-#VIRTUAL CLASS FOR RULES OPERATING ON TWO ARGUMENTS
-setClass("DoubleRule", representation = representation(firstRule="SingleRule", secondRule="SingleRule"),
-S3methods=TRUE)
-calculateDoubleSpecific <- function(x,y,z){stop ("No method to calculate it.")} #throw a mistake
-#[1] ADD TWO PREVIOUS EXPRESSIONS
-setClass("AddDoubleRule", contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateDoubleSpecific",signature(x="AddDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y+z)
-})
-#[2] MULTIPLY TWO PREVIOUS EXPRESSIONS
-setClass("MultDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateDoubleSpecific",signature(x="MultDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y*z)
-})
-#EXECUTING RULES OPERATING ON TWO ARGUMENTS
-calculateDouble <- function(x,y,z){stop ("No function to execute this.")} #throw a mistake
-setMethod("calculateDouble",signature(x="DoubleRule", y="numeric", z="numeric"),
-function(x, y, z){
-firstArg <- y #first element of the sequence
-secondArg <-z #second element of the sequence
-if(!is.null(x at firstRule)){ #if there are some rules nested inside
-firstArg <- calculate(x at firstRule,firstArg) #execute first single-argument rule
-}
-if(!is.null(x at secondRule)){
-secondArg <- calculate(x at secondRule,secondArg) #execute second single-argument rule
-}
-return(calculateDoubleSpecific(x,firstArg, secondArg)) #if there are no more nested rules, execute
-})
-##--------------------------test--------------------------------------------------------------
-p<-new("AddConstSingleRule", constantVal=6)
-q<-new("MultConstSingleRule", constantVal=10, previousRule=p)
-calculate(p,4)# 4+6=10
-calculate(q,4)# (4+6)*10=100
-s<-new("MultDoubleRule", firstRule=p)
-r<-new("AddDoubleRule")
-calculateDouble(s,2,2)# (2+6)*2=16
-calculateDouble(r,3,2)# 3+2=5
-calculateDouble(r,3,2)
-#-------------------------------------------------------------------------------------------
-#------------------------------SingleRules--------------------------------------------------
-#-------------------------------------------------------------------------------------------
-#VIRTUAL CLASS FOR RULES OPERATING ON SINGLE ARGUMENTS
-setClass("SingleRule",
-representation = representation(previousRule="SingleRule"),
-S3methods=TRUE)
-calculateSpecific <- function(x,y,z=NULL){
-return(y)
-}
-setMethod("calculateSpecific",signature(x="SingleRule", y="numeric"),
-function(x,y){
-return(y)
-})
-#[1] RULE 1 - ADDING A CONSTANT
-setClass("AddConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="AddConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal+y)
-})
-#[2] RULE 2 - MULTIPLYING BY A CONSTANT
-setClass("MultConstSingleRule",
-contains="SingleRule",
-representation(constantVal="numeric"),
-S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="MultConstSingleRule", y="numeric"),
-function(x,y){
-return(x at constantVal*y)
-})
-#[4] DIGITSUM
-digits <- function(x) {
-if(length(x) > 1 ) {
-lapply(x, digits)
-} else {
-n <- nchar(x)
-rev( x %/% 10^seq(0, length.out=n) %% 10 )
-}
-}
-setClass("DigSumSingleRule", contains="SingleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="DigSumSingleRule",y="numeric"),
-function(x,y){
-return(sum(digits(y)))
-})
-#[5] NEGATIVE
-setClass("NegativeSingleRule", contains="SingleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="NegativeSingleRule",y="numeric"),
-function(x,y){
-return(-y)
-})
-#[4] IDENTICAL FUNCTION (input=output) used in random sequence generation
-setClass("IdenSingleRule",contains="SingleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="IdenSingleRule",y="numeric"),
-function(x,y){
-return(y)
-})
-#EXECUTING RULES REFERING TO SINGLE ARGUMENT
-calculate <- function(x,y,z=NULL){
-return(y)
-}
-setMethod("calculate",signature(x="SingleRule", y="numeric"), #both [1] and [2] inherit from class 'SingleRule'
-function(x, y){
-result<-y
-if(!is.null(x at previousRule)){ # if there are some rules nested inside 'x'
-result <- calculate(x at previousRule,result)
-}
-return(calculateSpecific(x,result)) # if there are no more nested functions, execute
-})
-#-------------------------------------------------------------------------------------------
-#------------------------------------------------DoubleRules--------------------------------
-#-------------------------------------------------------------------------------------------
-#VIRTUAL CLASS FOR RULES OPERATING ON TWO ARGUMENTS
-# firstRule - operations to be executed at the first element of the numeric sequence (it is an object of class 'SingleRule')
-# secondRule - operations to be executed at the second element of the numeric sequence (it is an object of class 'SingleRule')
-# nextSingle - operation to be executed at the result of function DoubleRule
-setClass("DoubleRule", representation = representation(firstRule="SingleRule", secondRule="SingleRule",nextSingle="SingleRule"),
-S3methods=TRUE)
-#[1] ADD TWO PREVIOUS EXPRESSIONS
-setClass("AddDoubleRule", contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="AddDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y+z)
-})
-#[2] MULTIPLY TWO PREVIOUS EXPRESSIONS
-setClass("MultDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="MultDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y*z)
-})
-#[3] SUBSTRACT TWO PREVIOUS EXPRESSIONS
-setClass("SubsDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",signature(x="SubsDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y-z)
-})
-#[4] DIVIDING TWO NUMBERS (Philipp)
-setClass("DivDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",
-signature(x="DivDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y%/%z)
-})
-#[5] MODULO (Philipp)
-setClass("ModuloDoubleRule",contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",
-signature(x="ModuloDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y%%z)
-})
-#[6] EXPONENTIAL FUNCTION (Philipp)
-setClass("ExpDoubleRule", contains="DoubleRule",S3methods=TRUE)
-setMethod("calculateSpecific",
-signature(x="ExpDoubleRule", y="numeric", z="numeric"),
-function(x,y,z){
-return(y^z)
-})
-#EXECUTING RULES OPERATING ON TWO ARGUMENTS
-setMethod("calculate",signature(x="DoubleRule", y="numeric", z="numeric"),
-function(x, y, z){
-firstArg <- y #first element of the sequence
-secondArg <-z #second element of the sequence
-if(!is.null(x at firstRule)){ #if there are some rules nested inside
-firstArg <- calculate(x at firstRule,firstArg) #execute first single-argument rule
-}
-if(!is.null(x at secondRule)){
-secondArg <- calculate(x at secondRule,secondArg) #execute second single-argument rule
-}
-result<-calculateSpecific(x,firstArg, secondArg) #if there are no more nested rules, execute
-if(!is.null(x at nextSingle)){
-result<-calculate(x at nextSingle, result)
-}
-return(result)
-})
-#-------------------------------------------------------------------------------------------
-#----------------------------------generating sequences-------------------------------------
-#-------------------------------------------------------------------------------------------
-#a list of single rules
-singleRules<-list("IdenSingleRule","AddConstSingleRule","MultConstSingleRule","DigSumSingleRule","NegativeSingleRule")
-#a list of double rules
-doubleRules<-list("AddDoubleRule","MultDoubleRule","SubsDoubleRule","DivDoubleRule","ModuloDoubleRule","ExpDoubleRule")
-#A FUNCTION TO CREATE SINGLE RULES
-# 'a1' is an index from table SingleRule (default a=NULL) //if 'a' is NULL it will be generated
-# 'n' how many rules are to be nested (default=NULL menas that I want to generate it automatically let's say from c(0,1,2)
-# n=0 would mean that I want to create just one rule with nothing nested inside)
-# 'cv1' is a constant value
-# '...' if I would like to add some rules nested I can provide their parameters cv must be always supplied #9even if the function doesn't require that
-createSR<-function(a1=NULL,cv1=NULL,n=NULL,...){
-p<-list(...)#arguments for nesting other functions
-p<-unlist(p)
-#if(!is.null(n) && length(p)!=2*n) stop (paste("parameters of functions to be nested do not match n=",n))
-#for(i in seq(1,length(p),by=2)){if(k[i]>length(p)) stop (paste("List of rules is shorter than ",k[i]))}
-if(is.null(a1)) {a1<-sample(2:length(singleRules),1)} #generate 'a' if no is supplied (we don't want to generate a=1 because it is identical function)
-if(is.null(cv1)) {cv1<-sample(-100:100,1)} # generate a constant value if no is supplied
-if(is.null(n)){n<-sample(c(0,1,2),1,prob=c(3/6,2/6,1/6)) #nesting more than two rules would be impossible to guess
-p<-as.vector(matrix(replicate(n,c(sample(1:length(singleRules),1),sample(1:100,1))),1,2*n))
-} # generate 'n' if it is set as null with different probabilities
-if("constantVal"%in%slotNames(singleRules[[a1]])){m<-new(singleRules[[a1]],constantVal=cv1)} else{m<-new(singleRules[[a1]])}
-if(n!=0) {k<-createSR(p[[1]],p[[2]],n-1,p[-c(1,2)]); m at previousRule<-k
-}#else{return(m)}
-return(m)
-}
-# A FUNCTION TO COMBINE DOUBLE RULES - it generates all parameters automatically
-# 'a' is index from a list of DoubleRules
-#'fr' firstRule argument of an object of class doubleRule
-#'sr' secondRule argument of an object of class doubleRule
-#'ns' nextSingle argument of an object of class doubleRule
-#'
-createDR<-function(a=NULL,fr=NULL,sr=NULL,ns=NULL){
-if(!is.null(a) && a>length(doubleRules)) stop (paste("The list of doublrRules is shoreter than ",a, ".Please specify 'a' value, which is smaller than or equal to",length(doubleRules)))
-if(!inherits(fr,"SingleRule") && !is.null(fr))stop(paste("'fr' argument must inherit from class singleRule"))
-if(!inherits(sr,"SingleRule") && !is.null(sr))stop(paste("'sr' argument must inherit from class singleRule"))
-if(!inherits(ns,"SingleRule") && !is.null(ns))stop(paste("'ns' argument must inherit from class singleRule"))
-if(is.null(a)) a<-sample(1:length(doubleRules),1) #generate an index of a doubleRule from the list of doubleRules
-a<-doubleRules[[a]]
-if(is.null(fr)) fr<-sample(c(createSR(),new("IdenSingleRule")),1,prob=c(0.5,0.5))[[1]]# firstRule is chosen from an automatically generated SingleRule or identical rule returning the input
-if(is.null(sr)) sr<-sample(c(createSR(),new("IdenSingleRule")),1,prob=c(0.3,0.7))[[1]] #because adding more and more rules makes the rule very difficult I would generate identical function with greater probability
-if(is.null(ns)) ns<-sample(c(createSR(),new("IdenSingleRule")),1,prob=c(0.3,0.7))[[1]]
-p<-new(a,firstRule=fr, secondRule=sr,nextSingle=ns)
-return(p)
-}
-#A FUNCTION TO GENERATE NUMERIC SEQUENCE OF DECLARED LENGTH
-# 'n' is the length of the numeric sequence (default value is 6)
-# 'x1', 'x2' are the first elements of the numeric sequence (you don't always need 'x2')
-sequence<-function(x1,x2=NULL,rule,n=6){
-if(inherits(rule,"DoubleRule") && is.null(x2)) stop (" If you want to use a DoubleRoule you need to specify x2")
-if(class(x1)!="numeric" ||(class(x2)!="NULL" && class(x2)!="numeric")) stop ("arguments 'x1', 'x2' must be of type 'numeric'.")
-if(!inherits(rule,"SingleRule") && !inherits(rule,"DoubleRule")) stop ("'rule' argument must inherit from 'SingleRule' or 'DoubleRule' class")
-if(n<3) stop("sequence must be longer than 3")
-k<-list()
-k[1]=x1
-if(inherits(rule,"SingleRule")){
-for(i in 2:n){
-k[i]<-calculate(x=rule,y=k[[i-1]])
-}
-}else{
-k[2]=x2
-for(i in 3:n){
-k[i]<-calculate(x=rule,y=k[[i-2]],z=k[[i-1]])
-}
-}
-return(list(k,rule))
-}
-# checking if a vector is in any row of the matrix
-#'mx' is a matrix in which I am searching
-#'vec' is a vector which is being checked
-# result TRUE means that there is already such vector in the matrix
-duplicate<-function(mx,vec){
-return(any(apply(mx, 1, function(x, want) isTRUE(all.equal(x, want)), vec)))
-}
-#CHECKING IF THE SEQUENCE IS NOT CONSTANT
-# it returns '0' when teh sequence is constant and '1' when the sequence is not constant
-# a function examines three last elements of a sequence, so even sequences like 27,9,9,9,9 ... are excluded
-conCheck<-function(seq){
-if(class(seq)!="list") stop("sequence must be of type 'list'")
-m<-length(seq)
-if(identical(seq[m],seq[m-1]) && identical(seq[m],seq[m-2]) ) {return(0)} else {return(1)}
-}
-# checking whether the sequence is not constant, numbers are not greater than 1000 or no lesser than -1000
-# type=1 is totally automatic / type=2 generates rules from 'MyRules' list
-check<-function(seqlen,items,type){
-x1<-as.numeric(sample(1:100,1)) #generate the first element of numeric sequence
-x2<-as.numeric(sample(1:100,1)) # generate the second element of numeric sequence
-if(type==1){ # type=1 means automatic tests
-m<-sample(c(1,2),1) #if m=1 I will create a singleRule, if m=2 rule will be a combination of singleRules, if m=3 rule is a doubleRule
-if(m==1){rule<-createSR()} else{rule<-createDR()} } else
-{z<-sample(2:length(MyRules),1); rule<-MyRules[[z]] }# if m=1 create singleRule else create doubleRulr
-result<-sequence(x1,x2,rule,n=seqlen)[[1]]
-fun<-sequence(x1,x2,rule,n=seqlen)[[2]]
-if(conCheck(result)==0 ||any(is.na(result))|| max(unlist(result))>1000 || min(unlist(result))< -1000||duplicate(mx=items,vec=unlist(result[[1]])))
-{check(seqlen,items,type)} else{return(list(result=result,fun=fun))}
-}
-# AUTOMATIC TEST GENERATION
-# random
-# 'seqlen' specyfies how long should a single sequence be
-# 'type' = 1 everything generated automatically/ type=2 functions generated from the MyRules matrix
-# 'testlen' specyfies how many sequences (item positions) are there to be in a test
-automaticTest<-function(testlen,type=1,seqlen=6){
-if(class(type)!="numeric") stop ("argument 'type' must be of class 'numeric'")
-items<-matrix(NA,testlen,seqlen) #I will store generated items in a matrix
-rules<- list() # I will keep the rules on a list
-noise<-matrix(NA,testlen,5) # 5 noise answers will be stored in this matrix
-for(i in 1:testlen){
-b<-check(seqlen,items,type)
-items[i,]<-unlist(b[[1]]) # I treat last element as a correct answer
-rules[i]<-b[2]
-noise[i,] <-sample(c((items[i,seqlen]-6):(items[i,seqlen]+6))[-(seqlen+1)],5) # generate a sample of 5 elements from a set (correct answer-6: correct answer +6) excluding the correct answer
-}
-return(list(items=items,noise=noise,rules=rules))
-}
-#--------------------------------------------------------------------------------------------------------------------------------
-#---------------------------------------- rules defined by a user----------------------------------------------------------------
-#--------------------------------------------------------------------------------------------------------------------------------
-#LIST OF USER'S RULES
-# Verification table - in which I will store results of the rules
-# starting values are always 10 and 20, constantVal=14, seqlen=6
-# I check whether sequence generated for those values are identical for a new rule - if so - I won't add a new rule to the list
-VerifTable<-matrix(NA,1,6)
-MyRules<-list(NA)
-AddRule<-function(rule){
-if(!inherits(rule,"SingleRule") && !inherits(rule,"DoubleRule")) stop (paste("new Rule must be an object of class 'SingleRule' od 'DoubleRule'. It cannot be of class",class(rule)))
-s<-sequence(x1=10,x2=20,rule,n=6)
-if(duplicate(VerifTable,unlist(s[[1]]))==TRUE){stop ("There already is a rule that gives the same result.")} else{
-VerifTable<<-rbind(unlist(s[[1]]),VerifTable)
-MyRules[length(MyRules)+1]<<-rule
-print("Your rule succesfully added tp 'MyRule' list")
-}
-}
-#---------------------------------------------------------------------------
-#------function to print objects of class SingleRule and DoubleRule---------
-#---------------------------------------------------------------------------
-print.SingleRule<-function(x){
-pr<-function(x){
-cat(paste("\nname:", class(x)[1]))
-if("constantVal"%in%slotNames(x)) {cat(paste(", constant value: ", x at constantVal))}
-}
-pr(x)
-if(!class(x at previousRule)=="SingleRule"){x<-x at previousRule; print(x)}
-}
-print.DoubleRule<-function(x){
-x1=x
-cat(class(x1)[1])
-if("firstRule"%in%slotNames(x)){cat("\n FIRST RULE:"); x<-x at firstRule;print.SingleRule(x)}
-x=x1
-if("secondRule"%in%slotNames(x)){cat("\n SECOND RULE:"); x<-x at secondRule;print.SingleRule(x)}
-x=x1
-if("nextSingle"%in%slotNames(x)){cat("\n NEXT SINGLE:"); x<-x at nextSingle;print.SingleRule(x)}
-}
-package.skeleton(name="ruleR",path="C:/Documents and Settings/mk583/Desktop/ruler/pkg")
-package.skeleton(name="ruleR",path="C:/Documents and Settings/mk583/Desktop/ruler/pkg",code_files="C:/Documents and Settings/mk583/Desktop/ruler/pkg/ruleR.R")
-package.skeleton(name="ruleR",path="C:/Documents and Settings/mk583/Desktop/ruler/pkg",code_files="C:/Documents and Settings/mk583/Desktop/ruler/pkg/ruleR.R")
Deleted: pkg/Double2Single.R
===================================================================
--- pkg/Double2Single.R 2012-08-21 07:47:23 UTC (rev 38)
+++ pkg/Double2Single.R 2012-08-21 07:48:50 UTC (rev 39)
@@ -1,83 +0,0 @@
-setClass("ConstSingleRule",
- contains="SingleRule",
- representation(constantVal="numeric"),
- S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="ConstSingleRule", y="numeric"),
- function(x,y){
- return(x at constantVal)
- })
-
-setClass("DivDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateDoubleSpecific",
- signature(x="DivDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y%/%z)
- })
-
-setClass("ModuloDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateDoubleSpecific",
- signature(x="ModuloDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y%%z)
- })
-
-setClass("ExpDoubleRule", contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateDoubleSpecific",
- signature(x="ExpDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y^z)
- })
-
-
-## Transfer class, so that double rules can be used as single rules
-## for example if one of the arguments is a constant
-setClass("Double2Single",
- representation = representation(Rule="DoubleRule", firstRule="SingleRule",
- secondRule = "SingleRule"),
- contains="SingleRule", S3methods = TRUE)
-
-setMethod("calculateSpecific",signature(x="Double2Single",y="numeric"),
- function(x, y){
- firstArg <- y #previous element of the sequence
- secondArg <- y
-
- if(!is.null(x at firstRule)){ #if there are some rules nested inside
- firstArg <- calculate(x at firstRule,firstArg) #execute first single-argument rule
- }
- if(!is.null(x at secondRule)){
- secondArg <- calculate(x at secondRule,secondArg) #execute second single-argument rule
- }
- return(calculateDouble(x at Rule,firstArg, secondArg)) #if there are no more nested rules, execute
- })
-
-#### examples
-
-## square the first number, ignore the second
-const2 <- new("ConstSingleRule", constantVal = 2)
-square2 <- new("ExpDoubleRule", secondRule = const2)
-calculateDouble(square2, 3, 5) # 9
-calculateDouble(square2, 3, 1) # the same
-
-# now as Single rule
-squareDouble <- new("ExpDoubleRule")
-squareSingle <- new("Double2Single", Rule = squareDouble, secondRule = const2)
-calculate(squareSingle, 3) #9
-calculate(squareSingle, 4) #16
-
-
-## modulo second number
-mod <- new("ModuloDoubleRule")
-calculateDouble(mod, 13,7)
-
-## divide by 2 rounding down, i.e. integer division
-div2Double <- new("DivDoubleRule", secondRule = const2)
-calculateDouble(div2Double,5,7) #2
-calculateDouble(div2Double,5,77) #also 2, does not depend on 2nd arg
-div2Single <- new("Double2Single", Rule = div2Double)
-calculate(div2Single, 5) #2
-calculate(div2Single, 6) #3
-
Deleted: pkg/New.R
===================================================================
--- pkg/New.R 2012-08-21 07:47:23 UTC (rev 38)
+++ pkg/New.R 2012-08-21 07:48:50 UTC (rev 39)
@@ -1,549 +0,0 @@
-#-------------------------------------------------------------------------------------------
-#------------------------------SingleRules--------------------------------------------------
-#-------------------------------------------------------------------------------------------
-
-#VIRTUAL CLASS FOR RULES OPERATING ON SINGLE ARGUMENTS
-
-setClass("SingleRule",
- representation = representation(previousRule="SingleRule"),
- S3methods=TRUE)
-
-
-calculateSpecific <- function(x,y,z=NULL){
- return(y)
-}
-
-
-setMethod("calculateSpecific",signature(x="SingleRule", y="numeric"),
- function(x,y){
- return(y)
- })
-
-
-
-#[1] RULE 1 - ADDING A CONSTANT
-
-setClass("AddConstSingleRule",
- contains="SingleRule",
- representation(constantVal="numeric"),
- S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="AddConstSingleRule", y="numeric"),
- function(x,y){
- return(x at constantVal+y)
- })
-
-
-#[2] RULE 2 - MULTIPLYING BY A CONSTANT
-
-setClass("MultConstSingleRule",
- contains="SingleRule",
- representation(constantVal="numeric"),
- S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="MultConstSingleRule", y="numeric"),
- function(x,y){
- return(x at constantVal*y)
- })
-
-#[3] SUBSTRACTING A CONSTANT
-
-setClass("SubsConstSingleRule",
- contains="SingleRule",
- representation(constantVal="numeric"),
- S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="SubsConstSingleRule",y="numeric"),
- function(x,y){
- return(y-x at constantVal)
- })
-
-#[4] DIGITSUM
-digits <- function(x) {
- if(length(x) > 1 ) {
- lapply(x, digits)
- } else {
- n <- nchar(x)
- rev( x %/% 10^seq(0, length.out=n) %% 10 )
- }
-}
-
-
-
-setClass("DigSumSingleRule", contains="SingleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="DigSumSingleRule",y="numeric"),
- function(x,y){
- return(sum(digits(y)))
- })
-
-#[5] NEGATIVE
-
-setClass("NegativeSingleRule", contains="SingleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="NegativeSingleRule",y="numeric"),
- function(x,y){
- return(-y)
- })
-
-
-#[4] IDENTICAL FUNCTION (input=output) used in random sequence generation
-setClass("IdenSingleRule",contains="SingleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="IdenSingleRule",y="numeric"),
- function(x,y){
- return(y)
- })
-
-
-
-
-#EXECUTING RULES REFERING TO SINGLE ARGUMENT
-
-
-calculate <- function(x,y,z=NULL){
- return(y)
-}
-
-
-setMethod("calculate",signature(x="SingleRule", y="numeric"), #both [1] and [2] inherit from class 'SingleRule'
- function(x, y){
- result<-y
- if(!is.null(x at previousRule)){ # if there are some rules nested inside 'x'
- result <- calculate(x at previousRule,result)
- }
- return(calculateSpecific(x,result)) # if there are no more nested functions, execute
- })
-
-#-------------------------------------------------------------------------------------------
-#------------------------------------------------DoubleRules--------------------------------
-#-------------------------------------------------------------------------------------------
-#VIRTUAL CLASS FOR RULES OPERATING ON TWO ARGUMENTS
-
-# firstRule - operations to be executed at the first element of the numeric sequence (it is an object of class 'SingleRule')
-# secondRule - operations to be executed at the second element of the numeric sequence (it is an object of class 'SingleRule')
-# nextSingle - operation to be executed at the result of function DoubleRule
-
-
-setClass("DoubleRule", representation = representation(firstRule="SingleRule", secondRule="SingleRule",nextSingle="SingleRule"),
- S3methods=TRUE)
-
-
-
-#[1] ADD TWO PREVIOUS EXPRESSIONS
-
-setClass("AddDoubleRule", contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",signature(x="AddDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y+z)
- })
-
-#[2] MULTIPLY TWO PREVIOUS EXPRESSIONS
-
-setClass("MultDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-
-setMethod("calculateSpecific",signature(x="MultDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y*z)
- })
-
-#[3] SUBSTRACT TWO PREVIOUS EXPRESSIONS
-
-setClass("SubsDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-
-setMethod("calculateSpecific",signature(x="SubsDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y-z)
- })
-
-#[4] DIVIDING TWO NUMBERS (Philipp)
-
-setClass("DivDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",
- signature(x="DivDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y%/%z)
- })
-
-#[5] MODULO (Philipp)
-
-setClass("ModuloDoubleRule",contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",
- signature(x="ModuloDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y%%z)
- })
-
-#[6] EXPONENTIAL FUNCTION (Philipp)
-setClass("ExpDoubleRule", contains="DoubleRule",S3methods=TRUE)
-
-setMethod("calculateSpecific",
- signature(x="ExpDoubleRule", y="numeric", z="numeric"),
- function(x,y,z){
- return(y^z)
- })
-
-
-
-#EXECUTING RULES OPERATING ON TWO ARGUMENTS
-
-#calculate <- function(x,y,z){stop ("No function to execute this.")} #throw a mistake, because you should execute just single functions contained by cladd DoubleRule
-
-
-setMethod("calculate",signature(x="DoubleRule", y="numeric", z="numeric"),
- function(x, y, z){
- firstArg <- y #first element of the sequence
- secondArg <-z #second element of the sequence
-
- if(!is.null(x at firstRule)){ #if there are some rules nested inside
- firstArg <- calculate(x at firstRule,firstArg) #execute first single-argument rule
- }
-
- if(!is.null(x at secondRule)){
- secondArg <- calculate(x at secondRule,secondArg) #execute second single-argument rule
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/ruler -r 39
More information about the Ruler-commits
mailing list