Relación 4 - Historial de revisiones

Anasoscab en 08:24 17 nov 2021

2021-11-17T08:24:50Z

← Revisión anterior		Revisión del 08:24 17 nov 2021
Línea 45:		Línea 45:
	where primos n = [a \| a <- [1..n], divisores a == [1,a]]		where primos n = [a \| a <- [1..n], divisores a == [1,a]]
	divisores n = [ a \| a <- [1..n], n `mod` a == 0]		divisores n = [ a \| a <- [1..n], n `mod` a == 0]
			-- Ana Sosa Caballero
			divisoresPrimos :: Int -> [Int]
			divisoresPrimos x = [ n \| n <- divisores x, primo n]

			divisores x = [ n \| n <- [1..x] , mod x n == 0]

			primo x = divisores x == [1,x]
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
	-- Ejercicio 2. Un número es libre de cuadrados si no es divisible por el		-- Ejercicio 2. Un número es libre de cuadrados si no es divisible por el
Línea 118:		Línea 124:
	amigos4 :: Int -> Int -> Bool		amigos4 :: Int -> Int -> Bool
	amigos4 a b = a /= b && sum (init(divisores a)) == b && sum (init(divisores b)) == a		amigos4 a b = a /= b && sum (init(divisores a)) == b && sum (init(divisores b)) == a
			-- Ana Sosa Caballero
			amigos :: Int -> Int -> Bool
			amigos a b = and [ d(a) == b, d(b) == a, a/= b]

			divisores' x = [ n \| n <- [1..x-1] , mod x n == 0]

			d(n) = sum (divisores' n)

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 220:		Línea 233:
	("Pedro",[("Alg",9),("Cal",5),("Inf",3),("Fis",1)])]		("Pedro",[("Alg",9),("Cal",5),("Inf",3),("Fis",1)])]

	--Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín		--Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín, Ana Sosa Caballero
	calificaciones :: [(String,[(String,Int)])] -> String -> [(String,Int)]		calificaciones :: [(String,[(String,Int)])] -> String -> [(String,Int)]
	calificaciones t p = head[ ns \| (nom, ns) <- t, nom == p ]		calificaciones t p = head[ ns \| (nom, ns) <- t, nom == p ]
Línea 233:		Línea 246:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín		-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín, Ana Sosa Caballero
	todasAprobadas :: [(String,[(String,Int)])] -> String -> Bool		todasAprobadas :: [(String,[(String,Int)])] -> String -> Bool
	todasAprobadas t p = and[n>=5 \| (_, n) <- (calificaciones t p)]		todasAprobadas t p = and[n>=5 \| (_, n) <- (calificaciones t p)]
Línea 274:		Línea 287:
	angelini1 :: Integer -> Bool		angelini1 :: Integer -> Bool
	angelini1 n = or[c `elem` (show (2*n)) \| c <- (show n)]		angelini1 n = or[c `elem` (show (2*n)) \| c <- (show n)]

			-- Ana Sosa Caballero
			angelini :: Integer -> Bool
			angelini n = or [ x == y \| x <- digitos n, y <- digitos (2*n)]

			digitos 0 = []
			digitos n = digitos (div n 10 ) ++ [rem n 10]


	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 357:		Línea 378:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín		-- Elsa Domínguez, Adolfo Sagrera Vivancos, Ana Sánchez Martín, Ana Sosa Caballero
	aproximaPi n = sqrt (6*sum [1/x^2 \| x <- [1..n]])		aproximaPi n = sqrt (6*sum [1/x^2 \| x <- [1..n]])

217.217.85.84 en 09:43 7 nov 2021

2021-11-07T09:43:23Z

← Revisión anterior		Revisión del 09:43 7 nov 2021
Línea 426:		Línea 426:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	--Nicolás Rodríguez Ruiz y Elsa Domínguez		--Nicolás Rodríguez Ruiz y Elsa Domínguez, Adolfo Sagrera Vivancos
	perpendiculares :: (Num a, Eq a) => [a] -> [[a]] -> [[a]]		perpendiculares :: (Num a, Eq a) => [a] -> [[a]] -> [[a]]
	perpendiculares xs yss = [ ys \| ys <- yss, xs `productoEscalar` ys==0]		perpendiculares xs yss = [ ys \| ys <- yss, xs `productoEscalar` ys==0]
Línea 455:		Línea 455:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez, Ana Sánchez Martín		-- Elsa Domínguez, Ana Sánchez Martín, Adolfo Sagrera Vivancos
	mayorSalto :: [Integer] -> Integer		mayorSalto :: [Integer] -> Integer
	mayorSalto xs = maximum [abs (a-b) \| (a,b) <- zip xs (tail xs)]		mayorSalto xs = maximum [abs (a-b) \| (a,b) <- zip xs (tail xs)]

217.217.85.84 en 20:37 4 nov 2021

2021-11-04T20:37:22Z

← Revisión anterior		Revisión del 20:37 4 nov 2021
Línea 300:		Línea 300:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Lucía Hernández, Elsa Domínguez, Ana Sánchez Martín		-- Lucía Hernández, Elsa Domínguez, Ana Sánchez Martín, Adolfo Sagrera Vivancos
	multiplosUnitarios :: Int -> Int -> Int -> [Int]		multiplosUnitarios :: Int -> Int -> Int -> [Int]
	multiplosUnitarios x y n = take n ([a \| a<- unitarios y, mod a x == 0])		multiplosUnitarios x y n = take n ([a \| a<- unitarios y, mod a x == 0])
Línea 408:		Línea 408:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez, Ana Sánchez Martín		-- Elsa Domínguez, Ana Sánchez Martín, Adolfo Sagrera Vivancos
	pares :: [a] -> [a]		pares :: [a] -> [a]
	pares cs = [a \| (a,b) <- conPos cs, even b]		pares cs = [a \| (a,b) <- conPos cs, even b]
Línea 502:		Línea 502:
	numeroConsecutivosC2 xs =		numeroConsecutivosC2 xs =
	head [k \| (x,y,k) <- zip3 xs (tail xs) [1..], y /= x+1]		head [k \| (x,y,k) <- zip3 xs (tail xs) [1..], y /= x+1]
			--Adolfo Sagrera Vivancos
			numeroConsecutivos xs = sum [ 1 \| (a,b) <- posicion1 xs, a == b]
			posicion1 xs = zip xs [1..]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 519:		Línea 521:
	sumaEquidistantes :: Num a => [a] -> [a]		sumaEquidistantes :: Num a => [a] -> [a]
	sumaEquidistantes xs = reverse (drop (div (length xs) 2) [a+b \| (a,b) <- zip xs (reverse xs)])		sumaEquidistantes xs = reverse (drop (div (length xs) 2) [a+b \| (a,b) <- zip xs (reverse xs)])
			-- Adolfo Sagrera Vivancos
			sumaEquidistantes xs = nub [ a+b \| (a,b) <- agrupa1 xs]
			agrupa1 xs = (zip xs (reverse xs))

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 530:		Línea 535:
	-- cercanos [3,7,2,1] [5,11,9] == [(3,5),(7,5),(7,9)]		-- cercanos [3,7,2,1] [5,11,9] == [(3,5),(7,5),(7,9)]
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
	-- Lucía Hernández, Ana Sánchez Martín		-- Lucía Hernández, Ana Sánchez Martín, Adolfo Sagrera Vivancos
	distancia x y = abs(x-y)		distancia x y = abs(x-y)
	cercanos :: [Int] -> [Int] -> [(Int,Int)]		cercanos :: [Int] -> [Int] -> [(Int,Int)]
Línea 579:		Línea 584:
	primera n = read [head (show n)]		primera n = read [head (show n)]
	-- prof: también con digitToInt de Data.Char		-- prof: también con digitToInt de Data.Char
			-- Adolfo Sagrera Vivancos
			ultima1 n = last(cifras n)
			primera1 n = head (cifras n)


	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 590:		Línea 599:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez y Nicolás Rodríguez Ruiz, Ana Sánchez Martín		-- Elsa Domínguez y Nicolás Rodríguez Ruiz, Ana Sánchez Martín, Adolfo Sagrera Vivancos
	encadenadoC :: [Int] -> Bool		encadenadoC :: [Int] -> Bool
	encadenadoC xs = and [ ultima a == primera b \| (a,b) <- zip xs (tail xs)]		encadenadoC xs = and [ ultima a == primera b \| (a,b) <- zip xs (tail xs)]

	</source>		</source>

188.78.90.137 en 12:43 3 nov 2021

2021-11-03T12:43:47Z

Mostrar los cambios

Mdelamor en 23:02 2 nov 2021

2021-11-02T23:02:38Z

← Revisión anterior		Revisión del 23:02 2 nov 2021
Línea 469:		Línea 469:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

			-- Prof; posibles soluciones
			-- 1ª solución (con índices)
			numeroConsecutivosC :: (Num a, Eq a) => [a] -> Int
			numeroConsecutivosC xs
			\| null ys = length xs
			\| otherwise = head ys
			where ys = [n \| n <- [1..length xs -1], xs !! n /= 1 + xs !! (n-1)]

			-- 2ª solución (con zip3)
			numeroConsecutivosC2 :: (Num a, Eq a) => [a] -> Int
			numeroConsecutivosC2 [] = 0
			numeroConsecutivosC2 [x] = 1
			numeroConsecutivosC2 [x,y] \| x+1 == y = 2
			\| otherwise = 1
			numeroConsecutivosC2 xs =
			head [k \| (x,y,k) <- zip3 xs (tail xs) [1..], y /= x+1]


Línea 528:		Línea 544:
	-- Prof: otra opción		-- Prof: otra opción
	esCuadratica :: [Int] -> Bool		esCuadratica :: [Int] -> Bool
	esCuadratica xs = and [abs (a-b) == x^2 \| ((a,b),x) <- ~~zip ys~~ [1..]]		esCuadratica xs = and [abs (a-b) == x^2 \| (a,b,x) <- zip3 (tail xs) xs [1..]]
	~~where ys = zip (tail xs) xs~~

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

Mdelamor en 22:54 2 nov 2021

2021-11-02T22:54:51Z

← Revisión anterior		Revisión del 22:54 2 nov 2021
Línea 524:		Línea 524:
	esCuadratica :: [Int] -> Bool		esCuadratica :: [Int] -> Bool
	esCuadratica xs = [abs (a-b) \| (a,b) <- ys] == [x^2 \| x <- [1..length (ys)]]		esCuadratica xs = [abs (a-b) \| (a,b) <- ys] == [x^2 \| x <- [1..length (ys)]]
			where ys = zip (tail xs) xs

			-- Prof: otra opción
			esCuadratica :: [Int] -> Bool
			esCuadratica xs = and [abs (a-b) == x^2 \| ((a,b),x) <- zip ys [1..]]
	where ys = zip (tail xs) xs		where ys = zip (tail xs) xs

Línea 540:		Línea 545:
	ultima, primera :: Int -> Int		ultima, primera :: Int -> Int
	ultima n = rem n 10		ultima n = rem n 10
	primera n = read [head (show n)]		primera n = read [head (show n)]
			-- prof: también con digitToInt de Data.Char

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

217.217.85.84 en 17:28 1 nov 2021

2021-11-01T17:28:02Z

← Revisión anterior		Revisión del 17:28 1 nov 2021
Línea 182:		Línea 182:
	-- Prof: en esta solución se puede simplificar lo siguiente:		-- Prof: en esta solución se puede simplificar lo siguiente:
	-- - a^x `elem` (divisores b) se puede simplificar a simplemente comprobar si a^x divide a b		-- - a^x `elem` (divisores b) se puede simplificar a simplemente comprobar si a^x divide a b
			-- Adolfo Sagrera Vivancos
			multiplicidad2 :: Integer -> Integer -> Integer
			multiplicidad2 1 _ = 1
			multiplicidad2 x y = last [s \| s <- [0..y], rem y (x^s) == 0]

	-- -------------------------------------------------------------		-- -------------------------------------------------------------
Línea 205:		Línea 209:
	("Pedro",[("Alg",9),("Cal",5),("Inf",3),("Fis",1)])]		("Pedro",[("Alg",9),("Cal",5),("Inf",3),("Fis",1)])]

	--Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez		--Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	calificaciones :: [(String,[(String,Int)])] -> String -> [(String,Int)]		calificaciones :: [(String,[(String,Int)])] -> String -> [(String,Int)]
	calificaciones t p = head[ ns \| (nom, ns) <- t, nom == p ]		calificaciones t p = head[ ns \| (nom, ns) <- t, nom == p ]
Línea 218:		Línea 222:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez		-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	todasAprobadas :: [(String,[(String,Int)])] -> String -> Bool		todasAprobadas :: [(String,[(String,Int)])] -> String -> Bool
	todasAprobadas t p = and[n>=5 \| (_, n) <- (calificaciones t p)]		todasAprobadas t p = and[n>=5 \| (_, n) <- (calificaciones t p)]
Línea 230:		Línea 234:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez		-- Nicolás Rodríguez Ruiz, Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	aprobados :: [(String,[(String,Int)])] -> [String]		aprobados :: [(String,[(String,Int)])] -> [String]
	aprobados t = [nom \| (nom, _) <- t, todasAprobadas t nom]		aprobados t = [nom \| (nom, _) <- t, todasAprobadas t nom]
Línea 247:		Línea 251:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez		-- Elsa Domínguez, Adolfo Sagrera Vivancos
	angelini :: Integer -> Bool		angelini :: Integer -> Bool
	angelini n = not (null (cifrasIguales n))		angelini n = not (null (cifrasIguales n))
Línea 268:		Línea 272:
	-- take 3 (unitarios 1) == [1,11,111]		-- take 3 (unitarios 1) == [1,11,111]
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
	-- Lucía Hernández, Elsa Domínguez		-- Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	repetir x n = sum [x*10^i \| i<-[0..n-1]]		repetir x n = sum [x*10^i \| i<-[0..n-1]]

Línea 323:		Línea 327:
	\|length (nub [m\|(_,m)<-(vecesqueaparecen xs)]) == 1 = xs		\|length (nub [m\|(_,m)<-(vecesqueaparecen xs)]) == 1 = xs
	\|otherwise = [p\|(p,q)<-(listapoyo xs) , q == maximum ([m\|(_,m)<-(vecesqueaparecen xs)])]		\|otherwise = [p\|(p,q)<-(listapoyo xs) , q == maximum ([m\|(_,m)<-(vecesqueaparecen xs)])]
			-- Adolfo Sagrera Vivancos
			masOcurrentes :: Ord a => [a] -> [a]
			masOcurrentes xs = [x \| x <- xs, longitud xs == veces x xs]
			ordenados xs = group (sort xs)
			longitud xs = maximum [length n \| n <- ordenados xs]
			veces n xs = sum[1 \| a <- xs, n == a]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 336:		Línea 346:
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

	-- Elsa Domínguez		-- Elsa Domínguez, Adolfo Sagrera Vivancos
	aproximaPi n = sqrt (6*sum [1/x^2 \| x <- [1..n]])		aproximaPi n = sqrt (6*sum [1/x^2 \| x <- [1..n]])

Línea 356:		Línea 366:
	deBaseABase10 :: Int -> [Int] -> Int		deBaseABase10 :: Int -> [Int] -> Int
	deBaseABase10 b xs = sum [i*( b^n) \| (i,n)<- zip xs [0..length xs -1] ]		deBaseABase10 b xs = sum [i*( b^n) \| (i,n)<- zip xs [0..length xs -1] ]
			-- Adolfo Sagrera Vivancos
			deBaseABase10' :: Int -> [Int] -> Int
			deBaseABase10' b xs = sum[ n*(b^c) \| (n,c) <- posicion xs]
			posicion xs = zip xs [0..]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 371:		Línea 385:
	conPos1 :: [a] -> [(a,Int)]		conPos1 :: [a] -> [(a,Int)]
	conPos1 xs = zip xs [0..length xs-1]		conPos1 xs = zip xs [0..length xs-1]
			-- Adolfo Sagrera Vivancos
			conPos' :: [a] -> [(a,Int)]
			conPos' xs = zip xs [0..]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
Línea 437:		Línea 454:
	longCamino xs = sum [distancia a b \| (a,b) <- zip xs (tail xs)]		longCamino xs = sum [distancia a b \| (a,b) <- zip xs (tail xs)]
	where distancia (a,b) (x,y) = sqrt((x-a)^2 + (y-b)^2)		where distancia (a,b) (x,y) = sqrt((x-a)^2 + (y-b)^2)
			-- Adolfo Sagrera Vivancos
			longCamino1 :: [(Float,Float)] -> Float
			longCamino1 xs = sum [ sqrt ((c-a)^2 + ((d-b)^2)) \| ((a,b),(c,d)) <- agrupa xs]
			agrupa xs = zip (init xs) (tail xs)

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

176.32.54.118 en 11:58 1 nov 2021

2021-11-01T11:58:01Z

← Revisión anterior		Revisión del 11:58 1 nov 2021
Línea 311:		Línea 311:
	ocurrencias xs = [ ocurrencia a xs \| a <- xs]		ocurrencias xs = [ ocurrencia a xs \| a <- xs]
	ocurrencia a xs = sum [ 1 \| b <- xs, b == a]		ocurrencia a xs = sum [ 1 \| b <- xs, b == a]

			--Manuel ALcaide
			agrup xs = group (sort xs)

			vecesqueaparecen xs = nub [(n,length v)\|n<-xs,v<- agrup xs, elem n v]

			listapoyo xs = [(g,h)\|g<-(xs),(l,h)<-(vecesqueaparecen xs),g==l]

			masOcurrentes'' :: Ord a => [a] -> [a]
			masOcurrentes'' xs
			\|length (nub [m\|(_,m)<-(vecesqueaparecen xs)]) == 1 = xs
			\|otherwise = [p\|(p,q)<-(listapoyo xs) , q == maximum ([m\|(_,m)<-(vecesqueaparecen xs)])]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------

148.56.184.151 en 23:51 31 oct 2021

2021-10-31T23:51:26Z

← Revisión anterior		Revisión del 23:51 31 oct 2021
Línea 59:		Línea 59:
	-- libreDeCuadrados 40 == False		-- libreDeCuadrados 40 == False
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
	-- Lucía Hernández, Elsa Domínguez		-- Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	libreDeCuadrados :: Int -> Bool		libreDeCuadrados :: Int -> Bool
	libreDeCuadrados n = null [x \| x<- cuadrados n, mod n x == 0]		libreDeCuadrados n = null [x \| x<- cuadrados n, mod n x == 0]
Línea 89:		Línea 89:
	-- amigos 1184 1210 == True		-- amigos 1184 1210 == True
	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------
	-- Lucía Hernández, Elsa Domínguez		-- Lucía Hernández, Elsa Domínguez, Adolfo Sagrera Vivancos
	divisores :: Int -> [Int]		divisores :: Int -> [Int]
	divisores n = [x \| x<-[1..n], mod n x == 0]		divisores n = [x \| x<-[1..n], mod n x == 0]

78.30.20.125 en 14:03 30 oct 2021

2021-10-30T14:03:24Z

← Revisión anterior		Revisión del 14:03 30 oct 2021
Línea 507:		Línea 507:
	ultima, primera :: Int -> Int		ultima, primera :: Int -> Int
	ultima n = rem n 10		ultima n = rem n 10
	primera n = ~~fromEnum (~~head(show n)~~) - 48~~		primera n = read [head (show n)]

	-- ---------------------------------------------------------------------		-- ---------------------------------------------------------------------